diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-19 03:16:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-19 03:16:53 (GMT) |
| commit | 1c8aa215ec060f5df64ff99b088e8a97f45efb0b (patch) | |
| tree | a7bb3d703f97f3c622fc25235cbac2341210d0cd | |
| parent | 954591b9f3b43e7015bdd83acaa317658a9b7048 (diff) | |
| parent | 58aa90875da1ab075d712585305d1e520812bbb1 (diff) | |
| download | linux-1c8aa215ec060f5df64ff99b088e8a97f45efb0b.tar.xz | |
Merge branch 'vrf-next'
Nikolay Aleksandrov says:
====================
vrf: a few simplifications and cleanups
These patches remove some unnecessary checks (patches 3, 4), unnecessary
num_slaves member and refcnt manipulations which are already done by the
upper functions.
====================
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vrf.c | 15 | ||||
| -rw-r--r-- | include/net/vrf.h | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 95097cb..ed208317 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; } @@ -334,16 +333,12 @@ static struct slave *__vrf_find_slave_dev(struct slave_queue *queue, /* inverse of __vrf_insert_slave */ static void __vrf_remove_slave(struct slave_queue *queue, struct slave *slave) { - dev_put(slave->dev); list_del(&slave->list); - queue->num_slaves--; } static void __vrf_insert_slave(struct slave_queue *queue, struct slave *slave) { - dev_hold(slave->dev); list_add(&slave->list, &queue->all_slaves); - queue->num_slaves++; } static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) @@ -459,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; } @@ -630,9 +624,8 @@ static int vrf_device_event(struct notifier_block *unused, if (!vrf_ptr || netif_is_vrf(dev)) goto out; - vrf_dev = __dev_get_by_index(dev_net(dev), vrf_ptr->ifindex); - if (vrf_dev) - vrf_del_slave(vrf_dev, dev); + vrf_dev = netdev_master_upper_dev_get(dev); + vrf_del_slave(vrf_dev, dev); } out: return NOTIFY_DONE; diff --git a/include/net/vrf.h b/include/net/vrf.h index 40e3793..3bb4af4 100644 --- a/include/net/vrf.h +++ b/include/net/vrf.h @@ -24,7 +24,6 @@ struct slave { struct slave_queue { struct list_head all_slaves; - int num_slaves; }; struct net_vrf { |