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, 7 insertions, 3 deletions

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 0b3dbbec80d0..c3076e2c4294 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -34,6 +34,7 @@ static void __vlan_add_flags(struct net_port_vlans *v, u16 vid, u16 flags)
 
 static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
 {
+        const struct net_device_ops *ops;
         struct net_bridge_port *p = NULL;
         struct net_bridge *br;
         struct net_device *dev;
@@ -53,6 +54,7 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
                         br = v->parent.br;
                         dev = br->dev;
                 }
+                ops = dev->netdev_ops;
 
                 if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
                         /* Add VLAN to the device filter if it is supported.
@@ -61,7 +63,8 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
                          * that ever changes this code will allow tagged
                          * traffic to enter the bridge.
                          */
-                        err = dev->netdev_ops->ndo_vlan_rx_add_vid(dev, vid);
+                        err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),
+                                                       vid);
                         if (err)
                                 return err;
                 }
@@ -83,7 +86,7 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
 
 out_filt:
         if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER))
-                dev->netdev_ops->ndo_vlan_rx_kill_vid(dev, vid);
+                ops->ndo_vlan_rx_kill_vid(dev, htons(ETH_P_8021Q), vid);
         return err;
 }
 
@@ -97,9 +100,10 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
 
         if (v->port_idx && vid) {
                 struct net_device *dev = v->parent.port->dev;
+                const struct net_device_ops *ops = dev->netdev_ops;
 
                 if (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)
-                        dev->netdev_ops->ndo_vlan_rx_kill_vid(dev, vid);
+                        ops->ndo_vlan_rx_kill_vid(dev, htons(ETH_P_8021Q), vid);
         }
 
         clear_bit(vid, v->vlan_bitmap);