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

Commit 1c8aa215 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 954591b9 58aa9087

drivers/net/vrf.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -265,7 +265,6 @@ static void vrf_rtable_destroy(struct net_vrf *vrf) 
{

{

	struct dst_entry *dst = (struct dst_entry *)vrf->rth;

	struct dst_entry *dst = (struct dst_entry *)vrf->rth;





	if (dst)

	dst_destroy(dst);

	dst_destroy(dst);

	vrf->rth = NULL;

	vrf->rth = NULL;

}

}
@@ -334,16 +333,12 @@ static struct slave *__vrf_find_slave_dev(struct slave_queue *queue, 
/* inverse of __vrf_insert_slave */

/* inverse of __vrf_insert_slave */

static void __vrf_remove_slave(struct slave_queue *queue, struct slave *slave)

static void __vrf_remove_slave(struct slave_queue *queue, struct slave *slave)

{

{

	dev_put(slave->dev);

	list_del(&slave->list);

	list_del(&slave->list);

	queue->num_slaves--;

}

}





static void __vrf_insert_slave(struct slave_queue *queue, struct slave *slave)

static void __vrf_insert_slave(struct slave_queue *queue, struct slave *slave)

{

{

	dev_hold(slave->dev);

	list_add(&slave->list, &queue->all_slaves);

	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)

static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev)
@@ -459,7 +454,6 @@ static void vrf_dev_uninit(struct net_device *dev) 
	list_for_each_entry_safe(slave, next, head, list)

	list_for_each_entry_safe(slave, next, head, list)

		vrf_del_slave(dev, slave->dev);

		vrf_del_slave(dev, slave->dev);





	if (dev->dstats)

	free_percpu(dev->dstats);

	free_percpu(dev->dstats);

	dev->dstats = NULL;

	dev->dstats = NULL;

}

}
@@ -630,8 +624,7 @@ static int vrf_device_event(struct notifier_block *unused, 
		if (!vrf_ptr || netif_is_vrf(dev))

		if (!vrf_ptr || netif_is_vrf(dev))

			goto out;

			goto out;





		vrf_dev = __dev_get_by_index(dev_net(dev), vrf_ptr->ifindex);

		vrf_dev = netdev_master_upper_dev_get(dev);

		if (vrf_dev)

		vrf_del_slave(vrf_dev, dev);

		vrf_del_slave(vrf_dev, dev);

	}

	}

out:

out:

include/net/vrf.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ struct slave { 




struct slave_queue {

struct slave_queue {

	struct list_head	all_slaves;

	struct list_head	all_slaves;

	int			num_slaves;

};

};





struct net_vrf {

struct net_vrf {