[RFT] sky2: fix status length check on older chips
From: Stephen Hemminger <hidden>
Date: 2012-04-27 20:41:30
Mirko and I were working on a related issue, here is his fix. I proposed a similar alternative, but he was unavailable to test it, and therefore was still pending. Does this fix your problem? ================= From: From: Mirko Lindner <redacted> Bug: The VLAN bit of the MAC RX Status Word is unreliable in several older supported chips. Sometimes the VLAN bit is not set for valid VLAN packets and also sometimes the VLAN bit is set for non-VLAN packets that came after a VLAN packet. This results in a receive length error when VLAN hardware tagging is enabled. Fix: The driver uses only VLAN information included in VLAN status list elements, that signals that the VLAN tag field is valid. It must ignore the VLAN bit in the MAC RX Status Word. An additional variable set when evaluating the VLAN opcodes is used to indicate that the received packet is a VLAN packet and a packet length correction (subtraction of VLAN header length) must be done. Signed-off-by: Mirko Lindner <redacted>
--- a/drivers/net/ethernet/marvell/sky2.c 2012-04-18 23:44:40.637276647 -0700
+++ b/drivers/net/ethernet/marvell/sky2.c 2012-04-27 13:36:07.487834432 -0700@@ -2580,7 +2580,7 @@ static struct sk_buff *sky2_receive(stru struct sk_buff *skb = NULL; u16 count = (status & GMR_FS_LEN) >> 16; - if (status & GMR_FS_VLAN) + if (sky2->rx_vlan) count -= VLAN_HLEN; /* Account for vlan tag */ netif_printk(sky2, rx_status, KERN_DEBUG, dev,
@@ -2646,11 +2646,13 @@ static inline void sky2_tx_done(struct n } } -static inline void sky2_skb_rx(const struct sky2_port *sky2, - u32 status, struct sk_buff *skb) +static inline void sky2_skb_rx(struct sky2_port *sky2, + struct sk_buff *skb) { - if (status & GMR_FS_VLAN) + if (sky2->rx_vlan) { __vlan_hwaccel_put_tag(skb, be16_to_cpu(sky2->rx_tag)); + sky2->rx_vlan = 0; + } if (skb->ip_summed == CHECKSUM_NONE) netif_receive_skb(skb); --- a/drivers/net/ethernet/marvell/sky2.h 2012-02-13 09:23:53.642447236 -0800 +++ b/drivers/net/ethernet/marvell/sky2.h 2012-04-27 13:36:07.487834432 -0700
@@ -2242,6 +2242,7 @@ struct sky2_port { u16 rx_data_size; u16 rx_nfrags; u16 rx_tag; + u8 rx_vlan; struct { unsigned long last;