diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 02:25:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 02:25:45 -0400 |
| commit | 37cf95162af4036b4198756a590aab8126fa2ce4 (patch) | |
| tree | 373166854c78072bda9f7c834bef819e92a56fc3 /net/ipv6 | |
| parent | 1d1136012163ab5e33a97f9779af269cf4049cb9 (diff) | |
| parent | a3a4bfde8a271df7ee56fcf31b8d907d50e7f216 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
mscan: too much data copied to CAN frame due to 16 bit accesses
gro: refetch inet6_protos[] after pulling ext headers
bnx2x: fix cl_id allocation for non-eth clients for NPAR mode
mlx4_en: fix endianness with blue frame support
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/af_inet6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 3b5669a2582d..d27c797f9f05 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -875,6 +875,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, | |||
| 875 | skb_reset_transport_header(skb); | 875 | skb_reset_transport_header(skb); |
| 876 | __skb_push(skb, skb_gro_offset(skb)); | 876 | __skb_push(skb, skb_gro_offset(skb)); |
| 877 | 877 | ||
| 878 | ops = rcu_dereference(inet6_protos[proto]); | ||
| 878 | if (!ops || !ops->gro_receive) | 879 | if (!ops || !ops->gro_receive) |
| 879 | goto out_unlock; | 880 | goto out_unlock; |
| 880 | 881 | ||