diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-07-03 10:26:50 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-03 10:29:26 +0900 |
| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f (patch) | |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c /net/ipv4/gre_offload.c | |
| parent | Merge branch 'hns3-a-few-code-improvements' (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | linux-dev-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.xz linux-dev-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Simple overlapping changes in stmmac driver.
Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre_offload.c')
| -rw-r--r-- | net/ipv4/gre_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index b9673c21be45..6c63524f598a 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -223,7 +223,7 @@ static struct sk_buff *gre_gro_receive(struct list_head *head, out_unlock: rcu_read_unlock(); out: - NAPI_GRO_CB(skb)->flush |= flush; + skb_gro_flush_final(skb, pp, flush); return pp; } |