/[linux-patches]/genpatches-2.6/tags/2.6.15-11/1036_4_ppp-rx-csum.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.15-11/1036_4_ppp-rx-csum.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 351 - (show annotations) (download)
Wed Mar 29 11:55:38 2006 UTC (12 years, 3 months ago) by dsd
File size: 1611 byte(s)
2.6.15-11 release
1 From stable-bounces@linux.kernel.org Sun Feb 5 21:00:48 2006
2 Date: Sun, 05 Feb 2006 20:27:05 -0800 (PST)
3 From: "David S. Miller" <davem@davemloft.net>
4 To: stable@kernel.org
5 Cc:
6 Subject: [PPP]: Fixed hardware RX checksum handling
7
8 From: Herbert Xu <herbert@gondor.apana.org.au>
9
10 When we pull the PPP protocol off the skb, we forgot to update the
11 hardware RX checksum. This may lead to messages such as
12
13 dsl0: hw csum failure.
14
15 Similarly, we need to clear the hardware checksum flag when we use
16 the existing packet to store the decompressed result.
17
18 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 Signed-off-by: David S. Miller <davem@davemloft.net>
20 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
22 ---
23
24 drivers/net/ppp_generic.c | 3 +++
25 1 files changed, 3 insertions(+)
26
27 Index: linux-2.6.15.3/drivers/net/ppp_generic.c
28 ===================================================================
29 --- linux-2.6.15.3.orig/drivers/net/ppp_generic.c
30 +++ linux-2.6.15.3/drivers/net/ppp_generic.c
31 @@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp,
32 }
33 else if (!pskb_may_pull(skb, skb->len))
34 goto err;
35 + else
36 + skb->ip_summed = CHECKSUM_NONE;
37
38 len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
39 if (len <= 0) {
40 @@ -1690,6 +1692,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp,
41 kfree_skb(skb);
42 } else {
43 skb_pull(skb, 2); /* chop off protocol */
44 + skb_postpull_rcsum(skb, skb->data - 2, 2);
45 skb->dev = ppp->dev;
46 skb->protocol = htons(npindex_to_ethertype[npi]);
47 skb->mac.raw = skb->data;

  ViewVC Help
Powered by ViewVC 1.1.20