diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
| commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
| tree | 3270712f030549d77d4c55246d056e02b9def29d /net/ipv4/fou.c | |
| parent | ipv6: fix inet6_lookup_listener() (diff) | |
| parent | Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-ae95d7126104591348d37aaf78c8325967e02386.tar.xz linux-ae95d7126104591348d37aaf78c8325967e02386.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/fou.c')
| -rw-r--r-- | net/ipv4/fou.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c index 5738b9771067..d039f8fff57f 100644 --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -202,6 +202,9 @@ static struct sk_buff **fou_gro_receive(struct sock *sk, */ NAPI_GRO_CB(skb)->encap_mark = 0; + /* Flag this frame as already having an outer encap header */ + NAPI_GRO_CB(skb)->is_fou = 1; + rcu_read_lock(); offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; ops = rcu_dereference(offloads[proto]); @@ -367,6 +370,9 @@ static struct sk_buff **gue_gro_receive(struct sock *sk, */ NAPI_GRO_CB(skb)->encap_mark = 0; + /* Flag this frame as already having an outer encap header */ + NAPI_GRO_CB(skb)->is_fou = 1; + rcu_read_lock(); offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; ops = rcu_dereference(offloads[guehdr->proto_ctype]); |