Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67f3a90b authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

vrf: remove unnecessary duplicate check 



The upper/lower functions already check for duplicate slaves so no need
to do it again.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e367da02

drivers/net/vrf.c

+0 −8
Original line number Diff line number Diff line
@@ -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 */