diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e /net/core | |
| parent | net: phy: add BCM7425 and BCM7429 PHYs (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.tar.xz linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c
Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f77e64873caf..fe37309b6667 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3166,6 +3166,9 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) NAPI_GRO_CB(skb)->free = NAPI_GRO_FREE_STOLEN_HEAD; goto done; } + /* switch back to head shinfo */ + pinfo = skb_shinfo(p); + if (pinfo->frag_list) goto merge; if (skb_gro_len(p) != pinfo->gso_size) |