summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-09-06 15:51:48 -0700
committerDavid S. Miller <davem@davemloft.net>2005-09-06 15:51:48 -0700
commit48bc41a49c4f3aa760dff84e7f71437f5ed520fe (patch)
tree8f8bcf9c752f1860d5e02b063872685c84c8481b
parentf75268cd6cbd24e6c70ff1390f4de5d0bb618539 (diff)
downloadlinux-stable-48bc41a49c4f3aa760dff84e7f71437f5ed520fe.tar.gz
linux-stable-48bc41a49c4f3aa760dff84e7f71437f5ed520fe.tar.bz2
linux-stable-48bc41a49c4f3aa760dff84e7f71437f5ed520fe.zip
[IPV4]: Reassembly trim not clearing CHECKSUM_HW
This was found by inspection while looking for checksum problems with the skge driver that sets CHECKSUM_HW. It did not fix the problem, but it looks like it is needed. If IP reassembly is trimming an overlapping fragment, it should reset (or adjust) the hardware checksum flag on the skb. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ip_fragment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 9e6e683cc34d..e7d26d9943c2 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -457,7 +457,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
if (pskb_pull(skb, ihl) == NULL)
goto err;
- if (pskb_trim(skb, end-offset))
+ if (pskb_trim_rcsum(skb, end-offset))
goto err;
/* Find out which fragments are in front and at the back of us