diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:53:24 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:53:24 -0400 |
| commit | 2c0165a034a78921c19aa32a6979fa0eff827f69 (patch) | |
| tree | 867ade2814ff835886fbf48eae67ecc93503454d | |
| parent | 2aca4bbaceded6d7897a6a747d7e6861bb8437ce (diff) | |
| download | longterm-queue-4.12-2c0165a034a78921c19aa32a6979fa0eff827f69.tar.gz | |
net: refresh for sock_net wrapper
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-reevalulate-autoflowlabel-setting-after-sysctl-s.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/queue/net-reevalulate-autoflowlabel-setting-after-sysctl-s.patch b/queue/net-reevalulate-autoflowlabel-setting-after-sysctl-s.patch index ce291e0..287eea1 100644 --- a/queue/net-reevalulate-autoflowlabel-setting-after-sysctl-s.patch +++ b/queue/net-reevalulate-autoflowlabel-setting-after-sysctl-s.patch @@ -1,4 +1,4 @@ -From 513674b5a2c9c7a67501506419da5c3c77ac6f08 Mon Sep 17 00:00:00 2001 +From 5728609be627739a7e704832c0e345eb61367973 Mon Sep 17 00:00:00 2001 From: Shaohua Li <shli@fb.com> Date: Wed, 20 Dec 2017 12:10:21 -0800 Subject: [PATCH] net: reevalulate autoflowlabel setting after sysctl setting @@ -38,12 +38,13 @@ Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Tom Herbert <tom@quantonium.net> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h -index cb18c6290ca8..8415bf1a9776 100644 +index e1b442996f81..d3992ee30a5e 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h -@@ -273,7 +273,8 @@ struct ipv6_pinfo { +@@ -255,7 +255,8 @@ struct ipv6_pinfo { * 100: prefer care-of address */ dontfrag:1, @@ -54,19 +55,19 @@ index cb18c6290ca8..8415bf1a9776 100644 __u8 tclass; __be32 rcv_flowinfo; diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c -index c26f71234b9c..c9441ca45399 100644 +index a88b5b5b7955..619c7d8acc42 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c -@@ -210,7 +210,6 @@ lookup_protocol: +@@ -210,7 +210,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, np->mcast_hops = IPV6_DEFAULT_MCASTHOPS; np->mc_loop = 1; np->pmtudisc = IPV6_PMTUDISC_WANT; -- np->autoflowlabel = ip6_default_np_autolabel(net); - np->repflow = net->ipv6.sysctl.flowlabel_reflect; +- np->autoflowlabel = ip6_default_np_autolabel(sock_net(sk)); sk->sk_ipv6only = net->ipv6.sysctl.bindv6only; + /* Init the ipv4 part of the socket since we can have sockets diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c -index 5110a418cc4d..f7dd51c42314 100644 +index dc49fe004418..590c11b5e73e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -166,6 +166,14 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) @@ -93,7 +94,7 @@ index 5110a418cc4d..f7dd51c42314 100644 hdr->payload_len = htons(seg_len); hdr->nexthdr = proto; -@@ -1626,7 +1634,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, +@@ -1708,7 +1716,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, ip6_flow_hdr(hdr, v6_cork->tclass, ip6_make_flowlabel(net, skb, fl6->flowlabel, @@ -103,10 +104,10 @@ index 5110a418cc4d..f7dd51c42314 100644 hdr->nexthdr = proto; hdr->saddr = fl6->saddr; diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c -index b9404feabd78..2d4680e0376f 100644 +index f78478fdbfb9..53c51fee4d5b 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c -@@ -886,6 +886,7 @@ pref_skip_coa: +@@ -883,6 +883,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, break; case IPV6_AUTOFLOWLABEL: np->autoflowlabel = valbool; |