diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/name_distr.c | 4 | ||||
-rw-r--r-- | net/tipc/node.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index e6018b7eb197..c07612bab95c 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
@@ -102,7 +102,7 @@ void named_cluster_distribute(struct net *net, struct sk_buff *skb) | |||
102 | if (!oskb) | 102 | if (!oskb) |
103 | break; | 103 | break; |
104 | msg_set_destnode(buf_msg(oskb), dnode); | 104 | msg_set_destnode(buf_msg(oskb), dnode); |
105 | tipc_node_xmit_skb(net, oskb, dnode, dnode); | 105 | tipc_node_xmit_skb(net, oskb, dnode, 0); |
106 | } | 106 | } |
107 | rcu_read_unlock(); | 107 | rcu_read_unlock(); |
108 | 108 | ||
@@ -223,7 +223,7 @@ void tipc_named_node_up(struct net *net, u32 dnode) | |||
223 | &tn->nametbl->publ_list[TIPC_ZONE_SCOPE]); | 223 | &tn->nametbl->publ_list[TIPC_ZONE_SCOPE]); |
224 | rcu_read_unlock(); | 224 | rcu_read_unlock(); |
225 | 225 | ||
226 | tipc_node_xmit(net, &head, dnode, dnode); | 226 | tipc_node_xmit(net, &head, dnode, 0); |
227 | } | 227 | } |
228 | 228 | ||
229 | static void tipc_publ_subscribe(struct net *net, struct publication *publ, | 229 | static void tipc_publ_subscribe(struct net *net, struct publication *publ, |
diff --git a/net/tipc/node.c b/net/tipc/node.c index eb739d20ed46..f4772f53f41a 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -370,7 +370,7 @@ static void __tipc_node_link_up(struct tipc_node *n, int bearer_id, | |||
370 | tipc_link_set_active(ol, false); | 370 | tipc_link_set_active(ol, false); |
371 | } else if (nl->priority == ol->priority) { | 371 | } else if (nl->priority == ol->priority) { |
372 | tipc_link_set_active(nl, true); | 372 | tipc_link_set_active(nl, true); |
373 | *slot0 = bearer_id; | 373 | *slot1 = bearer_id; |
374 | } else { | 374 | } else { |
375 | pr_debug("New link <%s> is standby\n", nl->name); | 375 | pr_debug("New link <%s> is standby\n", nl->name); |
376 | } | 376 | } |