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/net/ethernet/3com | |
| 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/net/ethernet/3com')
| -rw-r--r-- | drivers/net/ethernet/3com/typhoon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 839a96213742..144942f6372b 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -1690,7 +1690,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read skb_checksum_none_assert(new_skb); if (rx->rxStatus & TYPHOON_RX_VLAN) - __vlan_hwaccel_put_tag(new_skb, + __vlan_hwaccel_put_tag(new_skb, htons(ETH_P_8021Q), ntohl(rx->vlanTag) & 0xffff); netif_receive_skb(new_skb); |