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

Commit f06c7f9f authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu() 



The __vlan_find_dev_deep should always called in RCU, according
David's suggestion, rename to __vlan_find_dev_deep_rcu looks more
reasonable.

Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60ff7467

drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter, 
		if (ether_addr_equal(dev->dev_addr, mac)) {

			rcu_read_lock();

			if (vlan && vlan != VLAN_VID_MASK) {

				dev = __vlan_find_dev_deep(dev, htons(ETH_P_8021Q), vlan);

				dev = __vlan_find_dev_deep_rcu(dev, htons(ETH_P_8021Q), vlan);

			} else if (netif_is_bond_slave(dev)) {

				struct net_device *upper_dev;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4068,7 +4068,7 @@ static int update_root_dev_clip(struct net_device *dev) 


	/* Parse all bond and vlan devices layered on top of the physical dev */

	for (i = 0; i < VLAN_N_VID; i++) {

		root_dev = __vlan_find_dev_deep(dev, htons(ETH_P_8021Q), i);

		root_dev = __vlan_find_dev_deep_rcu(dev, htons(ETH_P_8021Q), i);

		if (!root_dev)

			continue;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4146,7 +4146,7 @@ void qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event) 


	rcu_read_lock();

	for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {

		dev = __vlan_find_dev_deep(netdev, htons(ETH_P_8021Q), vid);

		dev = __vlan_find_dev_deep_rcu(netdev, htons(ETH_P_8021Q), vid);

		if (!dev)

			continue;

		qlcnic_config_indev_addr(adapter, dev, event);

drivers/net/usb/cdc_mbim.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci) 
	/* need to send the NA on the VLAN dev, if any */

	rcu_read_lock();

	if (tci) {

		netdev = __vlan_find_dev_deep(dev->net, htons(ETH_P_8021Q),

		netdev = __vlan_find_dev_deep_rcu(dev->net, htons(ETH_P_8021Q),

						  tci);

		if (!netdev) {

			rcu_read_unlock();

drivers/s390/net/qeth_l3_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ static void qeth_l3_add_vlan_mc(struct qeth_card *card) 
	for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {

		struct net_device *netdev;



		netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),

		netdev = __vlan_find_dev_deep_rcu(card->dev, htons(ETH_P_8021Q),

					      vid);

		if (netdev == NULL ||

		    !(netdev->flags & IFF_UP))
@@ -1721,7 +1721,7 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card) 
	for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {

		struct net_device *netdev;



		netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),

		netdev = __vlan_find_dev_deep_rcu(card->dev, htons(ETH_P_8021Q),

					      vid);

		if (netdev == NULL ||

		    !(netdev->flags & IFF_UP))
@@ -1766,7 +1766,7 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card, 


	QETH_CARD_TEXT(card, 4, "frvaddr4");



	netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid);

	netdev = __vlan_find_dev_deep_rcu(card->dev, htons(ETH_P_8021Q), vid);

	if (!netdev)

		return;

	in_dev = in_dev_get(netdev);
@@ -1796,7 +1796,7 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card, 


	QETH_CARD_TEXT(card, 4, "frvaddr6");



	netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid);

	netdev = __vlan_find_dev_deep_rcu(card->dev, htons(ETH_P_8021Q), vid);

	if (!netdev)

		return;

	in6_dev = in6_dev_get(netdev);
@@ -2089,7 +2089,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev, 
		struct net_device *netdev;



		rcu_read_lock();

		netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q),

		netdev = __vlan_find_dev_deep_rcu(card->dev, htons(ETH_P_8021Q),

					      vid);

		rcu_read_unlock();

		if (netdev == dev) {