r8169: improve handling VLAN tag

hkallweit · davem330 · commit 759d09574172 · 2019-06-29T12:29:39.000-07:00
The VLAN tag is stored in the descriptor in network byte order.
Using swab16 works on little endian host systems only. Better play safe
and use ntohs or htons respectively.

Signed-off-by: Heiner Kallweit &lt;hkallweit1@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
@@ -1528,15 +1528,16 @@ 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 | swab16(skb_vlan_tag_get(skb)) : 0x00;
+		TxVlanTag | htons(skb_vlan_tag_get(skb)) : 0x00;
 }
 
 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), swab16(opts2 & 0xffff));
+		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+				       ntohs(opts2 & 0xffff));
 }
 
 static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,

Original file line number	Diff line number	Diff line change
`@@ -1528,15 +1528,16 @@ static int rtl8169_set_features(struct net_device *dev,`
`1528`	`1528`	`static inline u32 rtl8169_tx_vlan_tag(struct sk_buff *skb)`
`1529`	`1529`	`{`
`1530`	`1530`	`return (skb_vlan_tag_present(skb)) ?`
`1531`		`- TxVlanTag \| swab16(skb_vlan_tag_get(skb)) : 0x00;`
	`1531`	`+ TxVlanTag \| htons(skb_vlan_tag_get(skb)) : 0x00;`
`1532`	`1532`	`}`
`1533`	`1533`
`1534`	`1534`	`static void rtl8169_rx_vlan_tag(struct RxDesc desc, struct sk_buff skb)`
`1535`	`1535`	`{`
`1536`	`1536`	`u32 opts2 = le32_to_cpu(desc->opts2);`
`1537`	`1537`
`1538`	`1538`	`if (opts2 & RxVlanTag)`
`1539`		`- __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));`
	`1539`	`+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),`
	`1540`	`+ ntohs(opts2 & 0xffff));`
`1540`	`1541`	`}`
`1541`	`1542`
`1542`	`1543`	`static void rtl8169_get_regs(struct net_device dev, struct ethtool_regs regs,`