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/ethernet/qlogic/qlge | |
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/ethernet/qlogic/qlge')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 8e3f43c75665..a9016acc2d6a 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -2326,7 +2326,7 @@ static int __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid) | |||
2326 | return err; | 2326 | return err; |
2327 | } | 2327 | } |
2328 | 2328 | ||
2329 | static int qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid) | 2329 | static int qlge_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid) |
2330 | { | 2330 | { |
2331 | struct ql_adapter *qdev = netdev_priv(ndev); | 2331 | struct ql_adapter *qdev = netdev_priv(ndev); |
2332 | int status; | 2332 | int status; |
@@ -2357,7 +2357,7 @@ static int __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid) | |||
2357 | return err; | 2357 | return err; |
2358 | } | 2358 | } |
2359 | 2359 | ||
2360 | static int qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid) | 2360 | static int qlge_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid) |
2361 | { | 2361 | { |
2362 | struct ql_adapter *qdev = netdev_priv(ndev); | 2362 | struct ql_adapter *qdev = netdev_priv(ndev); |
2363 | int status; | 2363 | int status; |