net: vlan: prepare for 802.1ad VLAN filtering offload

Change the rx_{add,kill}_vid callbacks to take a protocol argument in
preparation of 802.1ad support. The protocol argument used so far is
always htons(ETH_P_8021Q).

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

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8d324f8a1757..35e89e12a1f7 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -428,14 +428,15 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
  * @bond_dev: bonding net device that got called
  * @vid: vlan id being added
  */
-static int bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
+static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
+                                __be16 proto, u16 vid)
 {
         struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *stop_at;
         int i, res;
 
         bond_for_each_slave(bond, slave, i) {
-                res = vlan_vid_add(slave->dev, vid);
+                res = vlan_vid_add(slave->dev, proto, vid);
                 if (res)
                         goto unwind;
         }
@@ -453,7 +454,7 @@ unwind:
         /* unwind from head to the slave that failed */
         stop_at = slave;
         bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at)
-                vlan_vid_del(slave->dev, vid);
+                vlan_vid_del(slave->dev, proto, vid);
 
         return res;
 }
@@ -463,14 +464,15 @@ unwind:
  * @bond_dev: bonding net device that got called
  * @vid: vlan id being removed
  */
-static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
+static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
+                                 __be16 proto, u16 vid)
 {
         struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         int i, res;
 
         bond_for_each_slave(bond, slave, i)
-                vlan_vid_del(slave->dev, vid);
+                vlan_vid_del(slave->dev, proto, vid);
 
         res = bond_del_vlan(bond, vid);
         if (res) {
@@ -488,7 +490,8 @@ static void bond_add_vlans_on_slave(struct bonding *bond, struct net_device *sla
         int res;
 
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
-                res = vlan_vid_add(slave_dev, vlan->vlan_id);
+                res = vlan_vid_add(slave_dev, htons(ETH_P_8021Q),
+                                   vlan->vlan_id);
                 if (res)
                         pr_warning("%s: Failed to add vlan id %d to device %s\n",
                                    bond->dev->name, vlan->vlan_id,
@@ -504,7 +507,7 @@ static void bond_del_vlans_from_slave(struct bonding *bond,
         list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
                 if (!vlan->vlan_id)
                         continue;
-                vlan_vid_del(slave_dev, vlan->vlan_id);
+                vlan_vid_del(slave_dev, htons(ETH_P_8021Q), vlan->vlan_id);
         }
 }