* [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged
@ 2011-02-14 5:27 Guo-Fu Tseng
2011-02-14 5:27 ` [PATCH net-next-2.6 2/2] jme: Advance driver version Guo-Fu Tseng
2011-02-14 5:44 ` [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Guo-Fu Tseng @ 2011-02-14 5:27 UTC (permalink / raw)
To: David Miller
Cc: Guo-Fu Tseng, linux-netdev, Aries Lee, Devinchiu, Ethan Hsiao
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Some JMicron Chip treat 0 as error checksum for UDP packets.
Which should be "No checksum needed".
Reported-by: Adam Swift <Adam.Swift@omnitude.net>
Confirmed-by: "Aries Lee" <arieslee@jmicron.com>
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
drivers/net/jme.c | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index ed35e17..5b441b7 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -956,8 +956,34 @@ jme_disable_rx_engine(struct jme_adapter *jme)
jme_mac_rxclk_off(jme);
}
+static u16
+jme_udpsum(struct sk_buff *skb)
+{
+ u16 csum = 0xFFFFu;
+
+ if (skb->len < (ETH_HLEN + sizeof(struct iphdr)))
+ return csum;
+ if (skb->protocol != htons(ETH_P_IP))
+ return csum;
+ skb_set_network_header(skb, ETH_HLEN);
+ if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||
+ (skb->len < (ETH_HLEN +
+ (ip_hdr(skb)->ihl << 2) +
+ sizeof(struct udphdr)))) {
+ skb_reset_network_header(skb);
+ return csum;
+ }
+ skb_set_transport_header(skb,
+ ETH_HLEN + (ip_hdr(skb)->ihl << 2));
+ csum = udp_hdr(skb)->check;
+ skb_reset_transport_header(skb);
+ skb_reset_network_header(skb);
+
+ return csum;
+}
+
static int
-jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
+jme_rxsum_ok(struct jme_adapter *jme, u16 flags, struct sk_buff *skb)
{
if (!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
return false;
@@ -970,7 +996,7 @@ jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
}
if (unlikely((flags & (RXWBFLAG_MF | RXWBFLAG_UDPON | RXWBFLAG_UDPCS))
- == RXWBFLAG_UDPON)) {
+ == RXWBFLAG_UDPON) && jme_udpsum(skb)) {
if (flags & RXWBFLAG_IPV4)
netif_err(jme, rx_err, jme->dev, "UDP Checksum error\n");
return false;
@@ -1018,7 +1044,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
skb_put(skb, framesize);
skb->protocol = eth_type_trans(skb, jme->dev);
- if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
+ if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags), skb))
skb->ip_summed = CHECKSUM_UNNECESSARY;
else
skb_checksum_none_assert(skb);
--
1.7.2.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next-2.6 2/2] jme: Advance driver version
2011-02-14 5:27 [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged Guo-Fu Tseng
@ 2011-02-14 5:27 ` Guo-Fu Tseng
2011-02-14 5:44 ` David Miller
2011-02-14 5:44 ` [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Guo-Fu Tseng @ 2011-02-14 5:27 UTC (permalink / raw)
To: David Miller
Cc: Guo-Fu Tseng, linux-netdev, Aries Lee, Devinchiu, Ethan Hsiao
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
drivers/net/jme.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index b7ae0c7..8bf3045 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -26,7 +26,7 @@
#define __JME_H_INCLUDED__
#define DRV_NAME "jme"
-#define DRV_VERSION "1.0.7"
+#define DRV_VERSION "1.0.8"
#define PFX DRV_NAME ": "
#define PCI_DEVICE_ID_JMICRON_JMC250 0x0250
--
1.7.2.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged
2011-02-14 5:27 [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged Guo-Fu Tseng
2011-02-14 5:27 ` [PATCH net-next-2.6 2/2] jme: Advance driver version Guo-Fu Tseng
@ 2011-02-14 5:44 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2011-02-14 5:44 UTC (permalink / raw)
To: cooldavid; +Cc: netdev, arieslee, devinchiu, ethanhsiao
From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Mon, 14 Feb 2011 13:27:17 +0800
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
>
> Some JMicron Chip treat 0 as error checksum for UDP packets.
> Which should be "No checksum needed".
>
> Reported-by: Adam Swift <Adam.Swift@omnitude.net>
> Confirmed-by: "Aries Lee" <arieslee@jmicron.com>
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next-2.6 2/2] jme: Advance driver version
2011-02-14 5:27 ` [PATCH net-next-2.6 2/2] jme: Advance driver version Guo-Fu Tseng
@ 2011-02-14 5:44 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-02-14 5:44 UTC (permalink / raw)
To: cooldavid; +Cc: netdev, arieslee, devinchiu, ethanhsiao
From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Mon, 14 Feb 2011 13:27:18 +0800
> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
>
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-14 5:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-14 5:27 [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged Guo-Fu Tseng
2011-02-14 5:27 ` [PATCH net-next-2.6 2/2] jme: Advance driver version Guo-Fu Tseng
2011-02-14 5:44 ` David Miller
2011-02-14 5:44 ` [PATCH net-next-2.6 1/2] jme: Don't show UDP Checksum error if HW misjudged David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox