aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2013-04-18 22:04:28 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-19 14:45:27 -0400
commit80d5c3689b886308247da295a228a54df49a44f6 (patch)
treece7b1e6898c3f9fea945e67fd06b125dfcc61fe7 /drivers/net/ethernet/ibm
parentf646968f8f7c624587de729115d802372b9063dd (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 9c9fa745ff82..d1812aacbc7b 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -2110,7 +2110,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
2110 return NETDEV_TX_OK; 2110 return NETDEV_TX_OK;
2111} 2111}
2112 2112
2113static int ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 2113static int ehea_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
2114{ 2114{
2115 struct ehea_port *port = netdev_priv(dev); 2115 struct ehea_port *port = netdev_priv(dev);
2116 struct ehea_adapter *adapter = port->adapter; 2116 struct ehea_adapter *adapter = port->adapter;
@@ -2148,7 +2148,7 @@ out:
2148 return err; 2148 return err;
2149} 2149}
2150 2150
2151static int ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 2151static int ehea_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
2152{ 2152{
2153 struct ehea_port *port = netdev_priv(dev); 2153 struct ehea_port *port = netdev_priv(dev);
2154 struct ehea_adapter *adapter = port->adapter; 2154 struct ehea_adapter *adapter = port->adapter;