diff options
Diffstat (limited to 'testing/linux-scst/r8169-fix-rx-checksum-offload.patch')
| -rw-r--r-- | testing/linux-scst/r8169-fix-rx-checksum-offload.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/testing/linux-scst/r8169-fix-rx-checksum-offload.patch b/testing/linux-scst/r8169-fix-rx-checksum-offload.patch new file mode 100644 index 000000000..d979caac6 --- /dev/null +++ b/testing/linux-scst/r8169-fix-rx-checksum-offload.patch @@ -0,0 +1,62 @@ +From adea1ac7effbddbe60a9de6d63462bfe79289e59 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet <eric.dumazet@gmail.com> +Date: Sun, 5 Sep 2010 20:04:05 -0700 +Subject: [PATCH] r8169: fix rx checksum offload + +While porting GRO to r8169, I found this driver has a bug in its rx +path. + +All skbs given to network stack had their ip_summed set to +CHECKSUM_NONE, while hardware said they had correct TCP/UDP checksums. + +The reason is driver sets skb->ip_summed on the original skb before the +copy eventually done by copybreak. The fresh skb gets the ip_summed = +CHECKSUM_NONE value, forcing network stack to recompute checksum, and +preventing my GRO patch to work. + +Fix is to make the ip_summed setting after skb copy. + +Note : rx_copybreak current value is 16383, so all frames are copied... + +Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> +Acked-by: Francois Romieu <romieu@fr.zoreil.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/r8169.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index 07b3fb5..56a11e2 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -4450,9 +4450,8 @@ static inline int rtl8169_fragmented_frame(u32 status) + return (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag); + } + +-static inline void rtl8169_rx_csum(struct sk_buff *skb, struct RxDesc *desc) ++static inline void rtl8169_rx_csum(struct sk_buff *skb, u32 opts1) + { +- u32 opts1 = le32_to_cpu(desc->opts1); + u32 status = opts1 & RxProtoMask; + + if (((status == RxProtoTCP) && !(opts1 & TCPFail)) || +@@ -4546,8 +4545,6 @@ static int rtl8169_rx_interrupt(struct net_device *dev, + continue; + } + +- rtl8169_rx_csum(skb, desc); +- + if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) { + pci_dma_sync_single_for_device(pdev, addr, + pkt_size, PCI_DMA_FROMDEVICE); +@@ -4558,6 +4555,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, + tp->Rx_skbuff[entry] = NULL; + } + ++ rtl8169_rx_csum(skb, status); + skb_put(skb, pkt_size); + skb->protocol = eth_type_trans(skb, dev); + +-- +1.7.2.3 + |