p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vrf: simplify the netdev notifier function 

We can drop the check because if vrf_ptr is present then we must have
the vrf device as a master and since we're running with rtnl it can't go
away.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2015-08-18 20:28:04 +03:00 committed by David S. Miller
parent 3a4a27d3bd
commit 58aa90875d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/vrf.c
View File

@ -624,9 +624,8 @@ static int vrf_device_event(struct notifier_block *unused,
if (!vrf_ptr || netif_is_vrf(dev)) if (!vrf_ptr || netif_is_vrf(dev))
goto out; goto out;
vrf_dev = __dev_get_by_index(dev_net(dev), vrf_ptr->ifindex); vrf_dev = netdev_master_upper_dev_get(dev);
if (vrf_dev) vrf_del_slave(vrf_dev, dev);
vrf_del_slave(vrf_dev, dev);
} }
out: out:
return NOTIFY_DONE; return NOTIFY_DONE;