Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vrf: don't check for dstats and rth in uninit path

Browse Source 
dstats and rth are always present because we fail the device registration
if they can't be allocated in vrf_init() (ndo_init) so drop the unnecessary
checks.

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:03 +03:00 committed by David S. Miller
parent db5dbec5ef
commit 3a4a27d3bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/vrf.c
View File

@ -265,8 +265,7 @@ static void vrf_rtable_destroy(struct net_vrf *vrf)
{ {
struct dst_entry *dst = (struct dst_entry *)vrf->rth; struct dst_entry *dst = (struct dst_entry *)vrf->rth;
if (dst) dst_destroy(dst);
dst_destroy(dst);
vrf->rth = NULL; vrf->rth = NULL;
} }
@ -455,8 +454,7 @@ static void vrf_dev_uninit(struct net_device *dev)
list_for_each_entry_safe(slave, next, head, list) list_for_each_entry_safe(slave, next, head, list)
vrf_del_slave(dev, slave->dev); vrf_del_slave(dev, slave->dev);
if (dev->dstats) free_percpu(dev->dstats);
free_percpu(dev->dstats);
dev->dstats = NULL; dev->dstats = NULL;
} }