1 files changed, 7 insertions, 5 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 7de52b65173f..44bb66bde0e2 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -197,6 +197,7 @@ lookup_protocol:
         np->mcast_hops  = IPV6_DEFAULT_MCASTHOPS;
         np->mc_loop     = 1;
         np->pmtudisc    = IPV6_PMTUDISC_WANT;
+        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
@@ -342,7 +343,8 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                          */
                         v4addr = LOOPBACK4_IPV6;
                         if (!(addr_type & IPV6_ADDR_MULTICAST)) {
-                                if (!(inet->freebind || inet->transparent) &&
+                                if (!net->ipv6.sysctl.ip_nonlocal_bind &&
+                                    !(inet->freebind || inet->transparent) &&
                                     !ipv6_chk_addr(net, &addr->sin6_addr,
                                                    dev, 0)) {
                                         err = -EADDRNOTAVAIL;
@@ -679,8 +681,8 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,
         const struct ipv6_pinfo *np = inet6_sk(sk);
 
         if (np->rxopt.all) {
-                if ((opt->hop && (np->rxopt.bits.hopopts ||
-                                  np->rxopt.bits.ohopopts)) ||
+                if (((opt->flags & IP6SKB_HOPBYHOP) &&
+                     (np->rxopt.bits.hopopts || np->rxopt.bits.ohopopts)) ||
                     (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) &&
                      np->rxopt.bits.rxflow) ||
                     (opt->srcrt && (np->rxopt.bits.srcrt ||
@@ -766,10 +768,10 @@ static int __net_init inet6_net_init(struct net *net)
         net->ipv6.sysctl.bindv6only = 0;
         net->ipv6.sysctl.icmpv6_time = 1*HZ;
         net->ipv6.sysctl.flowlabel_consistency = 1;
-        net->ipv6.sysctl.auto_flowlabels = 0;
+        net->ipv6.sysctl.auto_flowlabels = IP6_DEFAULT_AUTO_FLOW_LABELS;
         net->ipv6.sysctl.idgen_retries = 3;
         net->ipv6.sysctl.idgen_delay = 1 * HZ;
-        net->ipv6.sysctl.flowlabel_state_ranges = 1;
+        net->ipv6.sysctl.flowlabel_state_ranges = 0;
         atomic_set(&net->ipv6.fib6_sernum, 1);
 
         err = ipv6_init_mibs(net);