diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-07-02 07:59:17 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-02 15:27:33 -0700 |
| commit | 7424edbb559036ddf63eb7c655b3305d91b12dc9 (patch) | |
| tree | 25a7842239cf14d27116e2e14d37da1df5cddc2e /drivers/net/ethernet/realtek/r8169_main.c | |
| parent | net: stmmac: make "snps,reset-delays-us" optional again (diff) | |
| download | linux-dev-7424edbb559036ddf63eb7c655b3305d91b12dc9.tar.xz linux-dev-7424edbb559036ddf63eb7c655b3305d91b12dc9.zip | |
Revert "r8169: improve handling VLAN tag"
This reverts commit 759d095741721888b6ee51afa74e0a66ce65e974.
The patch was based on a misunderstanding. As Al Viro pointed out [0]
it's simply wrong on big endian. So let's revert it.
[0] https://marc.info/?t=156200975600004&r=1&w=2
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169_main.c')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index a73f2532115b..22b2f3dcb41d 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1528,7 +1528,7 @@ static int rtl8169_set_features(struct net_device *dev, static inline u32 rtl8169_tx_vlan_tag(struct sk_buff *skb) { return (skb_vlan_tag_present(skb)) ? - TxVlanTag | htons(skb_vlan_tag_get(skb)) : 0x00; + TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00; } static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb) @@ -1536,8 +1536,7 @@ static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb) u32 opts2 = le32_to_cpu(desc->opts2); if (opts2 & RxVlanTag) - __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), - ntohs(opts2 & 0xffff)); + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff)); } static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, |