net: vlan: prepare for 802.1ad support

Make the encapsulation protocol value a property of VLAN devices and change
the device lookup functions to take the protocol value into account.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 35e89e12a1f7..1e79a7643f08 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -782,7 +782,7 @@ static void bond_resend_igmp_join_requests(struct bonding *bond)
 
         /* rejoin all groups on vlan devices */
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
-                vlan_dev = __vlan_find_dev_deep(bond_dev,
+                vlan_dev = __vlan_find_dev_deep(bond_dev, htons(ETH_P_8021Q),
                                                 vlan->vlan_id);
                 if (vlan_dev)
                         __bond_resend_igmp_join_requests(vlan_dev);
@@ -2512,7 +2512,8 @@ static int bond_has_this_ip(struct bonding *bond, __be32 ip)
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                 rcu_read_lock();
-                vlan_dev = __vlan_find_dev_deep(bond->dev, vlan->vlan_id);
+                vlan_dev = __vlan_find_dev_deep(bond->dev, htons(ETH_P_8021Q),
+                                                vlan->vlan_id);
                 rcu_read_unlock();
                 if (vlan_dev && ip == bond_confirm_addr(vlan_dev, 0, ip))
                         return 1;
@@ -2541,7 +2542,7 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
                 return;
         }
         if (vlan_id) {
-                skb = vlan_put_tag(skb, vlan_id);
+                skb = vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_id);
                 if (!skb) {
                         pr_err("failed to insert VLAN tag\n");
                         return;
@@ -2603,6 +2604,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                         rcu_read_lock();
                         vlan_dev = __vlan_find_dev_deep(bond->dev,
+                                                        htons(ETH_P_8021Q),
                                                         vlan->vlan_id);
                         rcu_read_unlock();
                         if (vlan_dev == rt->dst.dev) {
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 4232767862b5..0c96e5fe99cc 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -185,7 +185,7 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
                 if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) {
                         rcu_read_lock();
                         if (vlan && vlan != VLAN_VID_MASK) {
-                                dev = __vlan_find_dev_deep(dev, vlan);
+                                dev = __vlan_find_dev_deep(dev, htons(ETH_P_8021Q), vlan);
                         } else if (netif_is_bond_slave(dev)) {
                                 struct net_device *upper_dev;
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index e88e01312c67..d132765f92af 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -3346,7 +3346,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, vid);
+                dev = __vlan_find_dev_deep(netdev, htons(ETH_P_8021Q), vid);
                 if (!dev)
                         continue;
                 qlcnic_config_indev_addr(adapter, dev, event);