diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-04-27 14:44:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-27 14:44:29 +0200 |
| commit | edbd9e30306067c3a45c035eb95a6f49daaa2337 (patch) | |
| tree | 00e8ce4bbb0b517cea71ff14165b2b1d944d22f3 /include | |
| parent | bnx2x: driver version 1.48.105-1 (diff) | |
| download | linux-edbd9e30306067c3a45c035eb95a6f49daaa2337.tar.xz linux-edbd9e30306067c3a45c035eb95a6f49daaa2337.zip | |
gro: Fix handling of headers that extend over the tail
The skb_gro_* code fails to handle the case where a header starts
in the linear area but ends in the frags area. Since the goal
of skb_gro_* is to optimise the case of completely non-linear
packets, we can simply bail out if we have anything in the linear
area.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 31167451d08d..c9ef41916071 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1137,7 +1137,7 @@ static inline void skb_gro_reset_offset(struct sk_buff *skb) static inline void *skb_gro_mac_header(struct sk_buff *skb) { - return skb_mac_header(skb) < skb->data ? skb_mac_header(skb) : + return skb_headlen(skb) ? skb_mac_header(skb) : page_address(skb_shinfo(skb)->frags[0].page) + skb_shinfo(skb)->frags[0].page_offset; } |