diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 02:13:41 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 02:13:41 +0300 |
| commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
| tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /net/ipv4/gre_offload.c | |
| parent | 0c9aa209579d41c9b8bf1fc39ce042bea2ec422d (diff) | |
| parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
| download | linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz | |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
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 96e0efecefa6..d5cac99170b1 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -229,7 +229,7 @@ static struct sk_buff **gre_gro_receive(struct sk_buff **head, /* Adjusted NAPI_GRO_CB(skb)->csum after skb_gro_pull()*/ skb_gro_postpull_rcsum(skb, greh, grehlen); - pp = ptype->callbacks.gro_receive(head, skb); + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); flush = 0; out_unlock: |