Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

8 files changed, 47 insertions, 25 deletions

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 0b38ee98024b..2e246a1a9b43 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1164,6 +1164,9 @@ static void br_multicast_add_router(struct net_bridge *br,
         struct net_bridge_port *p;
         struct hlist_node *slot = NULL;
 
+        if (!hlist_unhashed(&port->rlist))
+                return;
+
         hlist_for_each_entry(p, &br->router_list, rlist) {
                 if ((unsigned long) port >= (unsigned long) p)
                         break;
@@ -1191,12 +1194,8 @@ static void br_multicast_mark_router(struct net_bridge *br,
         if (port->multicast_router != 1)
                 return;
 
-        if (!hlist_unhashed(&port->rlist))
-                goto timer;
-
         br_multicast_add_router(br, port);
 
-timer:
         mod_timer(&port->multicast_router_timer,
                   now + br->multicast_querier_interval);
 }
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9bac0e6f8dfa..b6a19ca0f99e 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4467,7 +4467,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len,
 
                 while (order) {
                         if (npages >= 1 << order) {
-                                page = alloc_pages(gfp_mask |
+                                page = alloc_pages((gfp_mask & ~__GFP_WAIT) |
                                                    __GFP_COMP |
                                                    __GFP_NOWARN |
                                                    __GFP_NORETRY,
diff --git a/net/core/sock.c b/net/core/sock.c
index e72633c346b1..7063c329c1b6 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -354,15 +354,12 @@ void sk_clear_memalloc(struct sock *sk)
 
         /*
          * SOCK_MEMALLOC is allowed to ignore rmem limits to ensure forward
-         * progress of swapping. However, if SOCK_MEMALLOC is cleared while
-         * it has rmem allocations there is a risk that the user of the
-         * socket cannot make forward progress due to exceeding the rmem
-         * limits. By rights, sk_clear_memalloc() should only be called
-         * on sockets being torn down but warn and reset the accounting if
-         * that assumption breaks.
+         * progress of swapping. SOCK_MEMALLOC may be cleared while
+         * it has rmem allocations due to the last swapfile being deactivated
+         * but there is a risk that the socket is unusable due to exceeding
+         * the rmem limits. Reclaim the reserves and obey rmem limits again.
          */
-        if (WARN_ON(sk->sk_forward_alloc))
-                sk_mem_reclaim(sk);
+        sk_mem_reclaim(sk);
 }
 EXPORT_SYMBOL_GPL(sk_clear_memalloc);
 
@@ -1872,7 +1869,7 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t gfp)
 
         pfrag->offset = 0;
         if (SKB_FRAG_PAGE_ORDER) {
-                pfrag->page = alloc_pages(gfp | __GFP_COMP |
+                pfrag->page = alloc_pages((gfp & ~__GFP_WAIT) | __GFP_COMP |
                                           __GFP_NOWARN | __GFP_NORETRY,
                                           SKB_FRAG_PAGE_ORDER);
                 if (likely(pfrag->page)) {
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 41a73da371a9..f2e464eba5ef 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -212,13 +212,13 @@ static int ip6_input_finish(struct sock *sk, struct sk_buff *skb)
          */
 
         rcu_read_lock();
+resubmit:
         idev = ip6_dst_idev(skb_dst(skb));
         if (!pskb_pull(skb, skb_transport_offset(skb)))
                 goto discard;
         nhoff = IP6CB(skb)->nhoff;
         nexthdr = skb_network_header(skb)[nhoff];
 
-resubmit:
         raw = raw6_local_deliver(skb, nexthdr);
         ipprot = rcu_dereference(inet6_protos[nexthdr]);
         if (ipprot) {
@@ -246,12 +246,10 @@ resubmit:
                         goto discard;
 
                 ret = ipprot->handler(skb);
-                if (ret < 0) {
-                        nexthdr = -ret;
+                if (ret > 0)
                         goto resubmit;
-                } else if (ret == 0) {
+                else if (ret == 0)
                         IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);
-                }
         } else {
                 if (!raw) {
                         if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index bff427f31924..1f93a5978f2a 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -564,6 +564,17 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
         case NETDEV_UNREGISTER:
                 mpls_ifdown(dev);
                 break;
+        case NETDEV_CHANGENAME:
+                mdev = mpls_dev_get(dev);
+                if (mdev) {
+                        int err;
+
+                        mpls_dev_sysctl_unregister(mdev);
+                        err = mpls_dev_sysctl_register(dev, mdev);
+                        if (err)
+                                return notifier_from_errno(err);
+                }
+                break;
         }
         return NOTIFY_OK;
 }
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index fb7976aee61c..4f15b7d730e1 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -381,13 +381,14 @@ nomem:
 }
 
 
-/* Public interface to creat the association shared key.
+/* Public interface to create the association shared key.
  * See code above for the algorithm.
  */
 int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp)
 {
         struct sctp_auth_bytes  *secret;
         struct sctp_shared_key *ep_key;
+        struct sctp_chunk *chunk;
 
         /* If we don't support AUTH, or peer is not capable
          * we don't need to do anything.
@@ -410,6 +411,14 @@ int sctp_auth_asoc_init_active_key(struct sctp_association *asoc, gfp_t gfp)
         sctp_auth_key_put(asoc->asoc_shared_key);
         asoc->asoc_shared_key = secret;
 
+        /* Update send queue in case any chunk already in there now
+         * needs authenticating
+         */
+        list_for_each_entry(chunk, &asoc->outqueue.out_chunk_list, list) {
+                if (sctp_auth_send_cid(chunk->chunk_hdr->type, asoc))
+                        chunk->auth = 1;
+        }
+
         return 0;
 }
 
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 30ea82a9b0f1..46b6ed534ef2 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2140,11 +2140,17 @@ static void tipc_sk_timeout(unsigned long data)
         peer_node = tsk_peer_node(tsk);
 
         if (tsk->probing_state == TIPC_CONN_PROBING) {
-                /* Previous probe not answered -> self abort */
-                skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,
-                                      TIPC_CONN_MSG, SHORT_H_SIZE, 0,
-                                      own_node, peer_node, tsk->portid,
-                                      peer_port, TIPC_ERR_NO_PORT);
+                if (!sock_owned_by_user(sk)) {
+                        sk->sk_socket->state = SS_DISCONNECTING;
+                        tsk->connected = 0;
+                        tipc_node_remove_conn(sock_net(sk), tsk_peer_node(tsk),
+                                              tsk_peer_port(tsk));
+                        sk->sk_state_change(sk);
+                } else {
+                        /* Try again later */
+                        sk_reset_timer(sk, &sk->sk_timer, (HZ / 20));
+                }
+
         } else {
                 skb = tipc_msg_create(CONN_MANAGER, CONN_PROBE,
                                       INT_H_SIZE, 0, peer_node, own_node,
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index fff1bef6ed6d..fd682832a0e3 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -1333,6 +1333,8 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
         memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN);
         wdev_unlock(wdev);
 
+        memset(&sinfo, 0, sizeof(sinfo));
+
         if (rdev_get_station(rdev, dev, bssid, &sinfo))
                 return NULL;