diff options
| author | Ingo Molnar | 2018-07-17 09:27:43 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-07-17 09:27:43 +0200 |
| commit | 52b544bd386688177c41d53e748111c29d0ccc98 (patch) | |
| tree | c2083582176e773084364af93cc44e0f94b6cde8 /drivers/net/geneve.c | |
| parent | afed7bcf9487bb28e2e2b016a195085c07416c0b (diff) | |
| parent | 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff) | |
Merge tag 'v4.18-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 750eaa53bf0c..ada33c2d9ac2 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -476,7 +476,7 @@ static struct sk_buff **geneve_gro_receive(struct sock *sk, out_unlock: rcu_read_unlock(); out: - NAPI_GRO_CB(skb)->flush |= flush; + skb_gro_flush_final(skb, pp, flush); return pp; } |