summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-09-18 09:33:27 -0700
committerDavid S. Miller <davem@davemloft.net>2018-09-18 09:33:27 -0700
commite366fa435032db1ce1538a2c029714666985dd48 (patch)
treed08bab02ba212339e4cfc0f2e3666435dd795b90 /net/ipv6/ip6_output.c
parentcf7d97e1e54d71679a8b11716dad9d21deb0e1e2 (diff)
parent5211da9ca526a5adddee1ccd078e6e33a583ab36 (diff)
downloadlinux-stable-e366fa435032db1ce1538a2c029714666985dd48.tar.gz
linux-stable-e366fa435032db1ce1538a2c029714666985dd48.tar.bz2
linux-stable-e366fa435032db1ce1538a2c029714666985dd48.zip
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next. Used Stephen Rothwell's linux-next resolution. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9a8934ac053b..89e0d5118afe 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -219,12 +219,10 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
kfree_skb(skb);
return -ENOBUFS;
}
+ if (skb->sk)
+ skb_set_owner_w(skb2, skb->sk);
consume_skb(skb);
skb = skb2;
- /* skb_set_owner_w() changes sk->sk_wmem_alloc atomically,
- * it is safe to call in our context (socket lock not held)
- */
- skb_set_owner_w(skb, (struct sock *)sk);
}
if (opt->opt_flen)
ipv6_push_frag_opts(skb, opt, &proto);