evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/hsr: Added SET_NETDEV_DEVTYPE and features |= NETIF_F_NETNS_LOCAL to dev_setup.

Browse source 
Signed-off-by: Arvid Brodin <arvid.brodin@alten.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arvid Brodin 2014-07-04 23:39:42 +02:00 • committed by David S. Miller
parent 1cc1eb5273
commit 4c3477dca2
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/hsr/hsr_device.c
View file

@ -501,15 +501,19 @@ static const struct net_device_ops hsr_device_ops = {
.ndo_fix_features = hsr_fix_features, .ndo_fix_features = hsr_fix_features,
}; };
static struct device_type hsr_type = {
.name = "hsr",
};
void hsr_dev_setup(struct net_device *dev) void hsr_dev_setup(struct net_device *dev)
{ {
random_ether_addr(dev->dev_addr); random_ether_addr(dev->dev_addr);
ether_setup(dev); ether_setup(dev);
dev->header_ops = &hsr_header_ops; dev->header_ops = &hsr_header_ops;
dev->netdev_ops = &hsr_device_ops; dev->netdev_ops = &hsr_device_ops;
dev->tx_queue_len = 0; SET_NETDEV_DEVTYPE(dev, &hsr_type);
dev->tx_queue_len = 0;
dev->destructor = hsr_dev_destroy; dev->destructor = hsr_dev_destroy;
@ -525,6 +529,10 @@ void hsr_dev_setup(struct net_device *dev)
* hsr_header_create() etc. * hsr_header_create() etc.
*/ */
dev->features |= NETIF_F_VLAN_CHALLENGED; dev->features |= NETIF_F_VLAN_CHALLENGED;
/* Not sure about this. Taken from bridge code. netdev_features.h says
* it means "Does not change network namespaces".
*/
dev->features |= NETIF_F_NETNS_LOCAL;
} }