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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 9 insertions, 7 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 3e513daecf80..e31d92f80572 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1962,8 +1962,10 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
 
         hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                           NLM_F_MULTI, TIPC_NL_LINK_GET);
-        if (!hdr)
+        if (!hdr) {
+                tipc_bcast_unlock(net);
                 return -EMSGSIZE;
+        }
 
         attrs = nla_nest_start(msg->skb, TIPC_NLA_LINK);
         if (!attrs)
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 10a1e8717c6f..9fcc2fb0ee00 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -346,12 +346,6 @@ struct tipc_node *tipc_node_create(struct net *net, u32 addr, u16 capabilities)
         skb_queue_head_init(&n->bc_entry.inputq2);
         for (i = 0; i < MAX_BEARERS; i++)
                 spin_lock_init(&n->links[i].lock);
-        hlist_add_head_rcu(&n->hash, &tn->node_htable[tipc_hashfn(addr)]);
-        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
-                if (n->addr < temp_node->addr)
-                        break;
-        }
-        list_add_tail_rcu(&n->list, &temp_node->list);
         n->state = SELF_DOWN_PEER_LEAVING;
         n->signature = INVALID_NODE_SIG;
         n->active_links[0] = INVALID_BEARER_ID;
@@ -372,6 +366,12 @@ struct tipc_node *tipc_node_create(struct net *net, u32 addr, u16 capabilities)
         tipc_node_get(n);
         setup_timer(&n->timer, tipc_node_timeout, (unsigned long)n);
         n->keepalive_intv = U32_MAX;
+        hlist_add_head_rcu(&n->hash, &tn->node_htable[tipc_hashfn(addr)]);
+        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
+                if (n->addr < temp_node->addr)
+                        break;
+        }
+        list_add_tail_rcu(&n->list, &temp_node->list);
 exit:
         spin_unlock_bh(&tn->node_list_lock);
         return n;