diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-19 06:04:30 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 22:46:06 +0400 |
| commit | 86a9bad3ab6b6f858fd4443b48738cabbb6d094c (patch) | |
| tree | 21d41b1c81e0f3e53ac4004627a8c9588099fea1 /drivers/infiniband/hw/nes | |
| parent | 1fd9b1fc310314911f66d2f14a8e4f0ef37bf47b (diff) | |
| download | linux-86a9bad3ab6b6f858fd4443b48738cabbb6d094c.tar.xz | |
net: vlan: add protocol argument to packet tagging functions
Add a protocol argument to the VLAN packet tagging functions. In case of HW
tagging, we need that protocol available in the ndo_start_xmit functions,
so it is stored in a new field in the skb. The new field fits into a hole
(on 64 bit) and doesn't increase the sks's size.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw/nes')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 67647e264611..418004c93feb 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c @@ -2948,7 +2948,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) nes_debug(NES_DBG_CQ, "%s: Reporting stripped VLAN packet. Tag = 0x%04X\n", nesvnic->netdev->name, vlan_tag); - __vlan_hwaccel_put_tag(rx_skb, vlan_tag); + __vlan_hwaccel_put_tag(rx_skb, htons(ETH_P_8021Q), vlan_tag); } if (nes_use_lro) lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL); |