summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-04-27 05:44:45 -0700
committerDavid S. Miller <davem@davemloft.net>2009-04-27 05:44:45 -0700
commit36e7b1b8dac1a785abca3a121b6b0b79f1a8d7df (patch)
treecdde7191a6e5d78bf9603983d5a71ec99fd5385b /net/ipv4
parentedbd9e30306067c3a45c035eb95a6f49daaa2337 (diff)
downloadblackbird-op-linux-36e7b1b8dac1a785abca3a121b6b0b79f1a8d7df.tar.gz
blackbird-op-linux-36e7b1b8dac1a785abca3a121b6b0b79f1a8d7df.zip
gro: Fix COMPLETE checksum handling
On a brand new GRO skb, we cannot call ip_hdr since the header may lie in the non-linear area. This patch adds the helper skb_gro_network_header to handle this. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_ipv4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 5d427f86b414..bda74e8aed7e 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2343,7 +2343,7 @@ void tcp4_proc_exit(void)
struct sk_buff **tcp4_gro_receive(struct sk_buff **head, struct sk_buff *skb)
{
- struct iphdr *iph = ip_hdr(skb);
+ struct iphdr *iph = skb_gro_network_header(skb);
switch (skb->ip_summed) {
case CHECKSUM_COMPLETE:
OpenPOWER on IntegriCloud