summaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 910d3827f499..a4a9148d4629 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2605,7 +2605,7 @@ static int tipc_sk_publish(struct tipc_sock *tsk, uint scope,
2605 if (unlikely(!publ)) 2605 if (unlikely(!publ))
2606 return -EINVAL; 2606 return -EINVAL;
2607 2607
2608 list_add(&publ->pport_list, &tsk->publications); 2608 list_add(&publ->binding_sock, &tsk->publications);
2609 tsk->pub_count++; 2609 tsk->pub_count++;
2610 tsk->published = 1; 2610 tsk->published = 1;
2611 return 0; 2611 return 0;
@@ -2622,7 +2622,7 @@ static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
2622 if (scope != TIPC_NODE_SCOPE) 2622 if (scope != TIPC_NODE_SCOPE)
2623 scope = TIPC_CLUSTER_SCOPE; 2623 scope = TIPC_CLUSTER_SCOPE;
2624 2624
2625 list_for_each_entry_safe(publ, safe, &tsk->publications, pport_list) { 2625 list_for_each_entry_safe(publ, safe, &tsk->publications, binding_sock) {
2626 if (seq) { 2626 if (seq) {
2627 if (publ->scope != scope) 2627 if (publ->scope != scope)
2628 continue; 2628 continue;
@@ -2633,12 +2633,12 @@ static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
2633 if (publ->upper != seq->upper) 2633 if (publ->upper != seq->upper)
2634 break; 2634 break;
2635 tipc_nametbl_withdraw(net, publ->type, publ->lower, 2635 tipc_nametbl_withdraw(net, publ->type, publ->lower,
2636 publ->ref, publ->key); 2636 publ->port, publ->key);
2637 rc = 0; 2637 rc = 0;
2638 break; 2638 break;
2639 } 2639 }
2640 tipc_nametbl_withdraw(net, publ->type, publ->lower, 2640 tipc_nametbl_withdraw(net, publ->type, publ->lower,
2641 publ->ref, publ->key); 2641 publ->port, publ->key);
2642 rc = 0; 2642 rc = 0;
2643 } 2643 }
2644 if (list_empty(&tsk->publications)) 2644 if (list_empty(&tsk->publications))
@@ -3292,7 +3292,7 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb,
3292 struct publication *p; 3292 struct publication *p;
3293 3293
3294 if (*last_publ) { 3294 if (*last_publ) {
3295 list_for_each_entry(p, &tsk->publications, pport_list) { 3295 list_for_each_entry(p, &tsk->publications, binding_sock) {
3296 if (p->key == *last_publ) 3296 if (p->key == *last_publ)
3297 break; 3297 break;
3298 } 3298 }
@@ -3309,10 +3309,10 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb,
3309 } 3309 }
3310 } else { 3310 } else {
3311 p = list_first_entry(&tsk->publications, struct publication, 3311 p = list_first_entry(&tsk->publications, struct publication,
3312 pport_list); 3312 binding_sock);
3313 } 3313 }
3314 3314
3315 list_for_each_entry_from(p, &tsk->publications, pport_list) { 3315 list_for_each_entry_from(p, &tsk->publications, binding_sock) {
3316 err = __tipc_nl_add_sk_publ(skb, cb, p); 3316 err = __tipc_nl_add_sk_publ(skb, cb, p);
3317 if (err) { 3317 if (err) {
3318 *last_publ = p->key; 3318 *last_publ = p->key;