aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-01-04 19:13:19 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-04 19:13:19 -0500
commitb530256d2e0f1a75fab31f9821129fff1bb49faa (patch)
treee3e615d405921fc157169180d53c91d09b9a7186 /net/core
parentcfc3a44c3c32abe48898398d9a92e8524c976803 (diff)
gro: Use gso_size to store MSS
In order to allow GRO packets without frag_list at all, we need to store the MSS in the packet itself. The obvious place is gso_size. The only thing to watch out for is if the packet ends up not being GRO then we need to clear gso_size before pushing the packet into the stack. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c2
-rw-r--r--net/core/skbuff.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 09c66a449da6..1e1a68066457 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2365,6 +2365,7 @@ static int napi_gro_complete(struct sk_buff *skb)
2365 } 2365 }
2366 2366
2367out: 2367out:
2368 skb_shinfo(skb)->gso_size = 0;
2368 __skb_push(skb, -skb_network_offset(skb)); 2369 __skb_push(skb, -skb_network_offset(skb));
2369 return netif_receive_skb(skb); 2370 return netif_receive_skb(skb);
2370} 2371}
@@ -2446,6 +2447,7 @@ int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
2446 } 2447 }
2447 2448
2448 NAPI_GRO_CB(skb)->count = 1; 2449 NAPI_GRO_CB(skb)->count = 1;
2450 skb_shinfo(skb)->gso_size = skb->len;
2449 skb->next = napi->gro_list; 2451 skb->next = napi->gro_list;
2450 napi->gro_list = skb; 2452 napi->gro_list = skb;
2451 2453
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b8d0abb26433..3aafb10325b8 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2613,6 +2613,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
2613 2613
2614 *NAPI_GRO_CB(nskb) = *NAPI_GRO_CB(p); 2614 *NAPI_GRO_CB(nskb) = *NAPI_GRO_CB(p);
2615 skb_shinfo(nskb)->frag_list = p; 2615 skb_shinfo(nskb)->frag_list = p;
2616 skb_shinfo(nskb)->gso_size = skb_shinfo(p)->gso_size;
2616 skb_header_release(p); 2617 skb_header_release(p);
2617 nskb->prev = p; 2618 nskb->prev = p;
2618 2619