diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-18 22:04:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:45:27 -0400 |
commit | 80d5c3689b886308247da295a228a54df49a44f6 (patch) | |
tree | ce7b1e6898c3f9fea945e67fd06b125dfcc61fe7 /drivers/net/vmxnet3/vmxnet3_drv.c | |
parent | f646968f8f7c624587de729115d802372b9063dd (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/vmxnet3/vmxnet3_drv.c')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index ba9bdad39986..27b889992ab8 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -1931,7 +1931,7 @@ vmxnet3_restore_vlan(struct vmxnet3_adapter *adapter) | |||
1931 | 1931 | ||
1932 | 1932 | ||
1933 | static int | 1933 | static int |
1934 | vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid) | 1934 | vmxnet3_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid) |
1935 | { | 1935 | { |
1936 | struct vmxnet3_adapter *adapter = netdev_priv(netdev); | 1936 | struct vmxnet3_adapter *adapter = netdev_priv(netdev); |
1937 | 1937 | ||
@@ -1953,7 +1953,7 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid) | |||
1953 | 1953 | ||
1954 | 1954 | ||
1955 | static int | 1955 | static int |
1956 | vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) | 1956 | vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid) |
1957 | { | 1957 | { |
1958 | struct vmxnet3_adapter *adapter = netdev_priv(netdev); | 1958 | struct vmxnet3_adapter *adapter = netdev_priv(netdev); |
1959 | 1959 | ||