diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-29 15:14:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-29 15:42:26 -0500 |
commit | 6bb8824732f69de0f233ae6b1a8158e149627b38 (patch) | |
tree | 78642311a28f42df9042da41eb98652c39d51327 /net/core | |
parent | d367341b25bd5aef3bf5524baa6f73e16ceced85 (diff) | |
parent | 2758b3e3e630ba304fc4aca434d591e70e528298 (diff) | |
download | linux-6bb8824732f69de0f233ae6b1a8158e149627b38.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/ipv6/ip6_gre.c is a case of parallel adds.
include/trace/events/tcp.h is a little bit more tricky. The removal
of in-trace-macro ifdefs in 'net' paralleled with moving
show_tcp_state_name and friends over to include/trace/events/sock.h
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/skbuff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 00b0757830e2..01e8285aea73 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1177,12 +1177,12 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask) int i, new_frags; u32 d_off; - if (!num_frags) - goto release; - if (skb_shared(skb) || skb_unclone(skb, gfp_mask)) return -EINVAL; + if (!num_frags) + goto release; + new_frags = (__skb_pagelen(skb) + PAGE_SIZE - 1) >> PAGE_SHIFT; for (i = 0; i < new_frags; i++) { page = alloc_page(gfp_mask); |