lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix vlan in 8139cp on big-endian

Browse Source 
Layout of opts2 is
: MSB(vlan_tag) : LSB(vlan_tag) : flags : 0 :
regardless of the host endianness.  On little-endian
the current code ends up with the right values, but
on big-endian it blows.  In r8169.c the same bug
had been fixed in commit d35da12a40426184b1d0844104b1d464753eba19
(r8169: endianness fixes).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro
2007-08-22 21:18:56 -04:00
committed by David S. Miller
parent d3bb52b094
commit cf9830195a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/8139cp.c
View File

@@ -78,7 +78,7 @@
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define CP_VLAN_TAG_USED 1 #define CP_VLAN_TAG_USED 1
#define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \ #define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \
do { (tx_desc)->opts2 = (vlan_tag_value); } while (0) do { (tx_desc)->opts2 = cpu_to_le32(vlan_tag_value); } while (0)
#else #else
#define CP_VLAN_TAG_USED 0 #define CP_VLAN_TAG_USED 0
#define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \ #define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \
@@ -304,7 +304,7 @@ static const unsigned int cp_rx_config =
struct cp_desc { struct cp_desc {
__le32 opts1; __le32 opts1;
u32 opts2; __le32 opts2;
__le64 addr; __le64 addr;
}; };
@@ -462,9 +462,9 @@ static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
cp->dev->last_rx = jiffies; cp->dev->last_rx = jiffies;
#if CP_VLAN_TAG_USED #if CP_VLAN_TAG_USED
if (cp->vlgrp && (desc->opts2 & RxVlanTagged)) { if (cp->vlgrp && (desc->opts2 & cpu_to_le32(RxVlanTagged))) {
vlan_hwaccel_receive_skb(skb, cp->vlgrp, vlan_hwaccel_receive_skb(skb, cp->vlgrp,
be16_to_cpu(desc->opts2 & 0xffff)); swab16(le32_to_cpu(desc->opts2) & 0xffff));
} else } else
#endif #endif
netif_receive_skb(skb); netif_receive_skb(skb);
@@ -765,7 +765,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
#if CP_VLAN_TAG_USED #if CP_VLAN_TAG_USED
if (cp->vlgrp && vlan_tx_tag_present(skb)) if (cp->vlgrp && vlan_tx_tag_present(skb))
vlan_tag = TxVlanTag | cpu_to_be16(vlan_tx_tag_get(skb)); vlan_tag = TxVlanTag | swab16(vlan_tx_tag_get(skb));
#endif #endif
entry = cp->tx_head; entry = cp->tx_head;