From: Nikolay Aleksandrov Date: Wed, 19 Aug 2015 03:27:08 +0000 (+0300) Subject: vrf: remove unnecessary duplicate check X-Git-Tag: v4.3-rc1~96^2~128^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=67f3a90b54322314a01af28946799a84c1b1d190;p=karo-tx-linux.git 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 Signed-off-by: David S. Miller --- 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 */