diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-08-18 19:28:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-19 05:16:52 +0200 |
| commit | 3a4a27d3bde1c9cd8159c86a79796348cab90140 (patch) | |
| tree | d6b8dccdcd3d03b163c08d1d25a0def72025205a /drivers/net/vrf.c | |
| parent | vrf: drop unused num_slaves member (diff) | |
| download | linux-3a4a27d3bde1c9cd8159c86a79796348cab90140.tar.xz linux-3a4a27d3bde1c9cd8159c86a79796348cab90140.zip | |
vrf: don't check for dstats and rth in uninit path
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>
Diffstat (limited to 'drivers/net/vrf.c')
| -rw-r--r-- | drivers/net/vrf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 3d7da0c6f827..97605eab14ae 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -265,8 +265,7 @@ static void vrf_rtable_destroy(struct net_vrf *vrf) { struct dst_entry *dst = (struct dst_entry *)vrf->rth; - if (dst) - dst_destroy(dst); + dst_destroy(dst); 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) vrf_del_slave(dev, slave->dev); - if (dev->dstats) - free_percpu(dev->dstats); + free_percpu(dev->dstats); dev->dstats = NULL; } |