diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 18:34:58 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 18:34:58 +0100 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /net/core/skbuff.c | |
| parent | Revert "knfsd: avoid overloading the CPU scheduler with enormous load averages" (diff) | |
| parent | Linux 2.6.32-rc8 (diff) | |
| download | linux-9b8b317d58084b9a44f6f33b355c4278d9f841fb.tar.xz linux-9b8b317d58084b9a44f6f33b355c4278d9f841fb.zip | |
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 80a96166df39..ec85681a7dd8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2701,7 +2701,8 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) NAPI_GRO_CB(skb)->free = 1; goto done; - } + } else if (skb_gro_len(p) != pinfo->gso_size) + return -E2BIG; headroom = skb_headroom(p); nskb = netdev_alloc_skb(p->dev, headroom + skb_gro_offset(p)); |