diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-08-19 06:27:08 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-20 13:01:57 -0700 |
| commit | 67f3a90b54322314a01af28946799a84c1b1d190 (patch) | |
| tree | 6b9192204b2235dc7c389ebbf9e43371567084f9 /drivers | |
| parent | vrf: don't panic on cache create failure (diff) | |
| download | linux-dev-67f3a90b54322314a01af28946799a84c1b1d190.tar.xz linux-dev-67f3a90b54322314a01af28946799a84c1b1d190.zip | |
vrf: remove unnecessary duplicate check
The upper/lower functions already check for duplicate slaves so no need
to do it again.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/vrf.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 01dc91562a88..9907550ff640 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -352,7 +352,6 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) { struct net_vrf_dev *vrf_ptr = kmalloc(sizeof(*vrf_ptr), GFP_KERNEL); struct slave *slave = kzalloc(sizeof(*slave), GFP_KERNEL); - struct slave *duplicate_slave; struct net_vrf *vrf = netdev_priv(dev); struct slave_queue *queue = &vrf->queue; int ret = -ENOMEM; @@ -361,16 +360,9 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) goto out_fail; slave->dev = port_dev; - vrf_ptr->ifindex = dev->ifindex; vrf_ptr->tb_id = vrf->tb_id; - duplicate_slave = __vrf_find_slave_dev(queue, port_dev); - if (duplicate_slave) { - ret = -EBUSY; - goto out_fail; - } - __vrf_insert_slave(queue, slave); /* register the packet handler for slave ports */ |