diff options
Diffstat (limited to 'net/tipc/name_table.c')
| -rw-r--r-- | net/tipc/name_table.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index ab0ac62a1287..0f47f08bf38f 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
| @@ -330,13 +330,9 @@ static struct publication *tipc_nameseq_insert_publ(struct net *net, | |||
| 330 | 330 | ||
| 331 | /* Any subscriptions waiting for notification? */ | 331 | /* Any subscriptions waiting for notification? */ |
| 332 | list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) { | 332 | list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) { |
| 333 | tipc_subscr_report_overlap(s, | 333 | tipc_subscrp_report_overlap(s, publ->lower, publ->upper, |
| 334 | publ->lower, | 334 | TIPC_PUBLISHED, publ->ref, |
| 335 | publ->upper, | 335 | publ->node, created_subseq); |
| 336 | TIPC_PUBLISHED, | ||
| 337 | publ->ref, | ||
| 338 | publ->node, | ||
| 339 | created_subseq); | ||
| 340 | } | 336 | } |
| 341 | return publ; | 337 | return publ; |
| 342 | } | 338 | } |
| @@ -404,13 +400,9 @@ found: | |||
| 404 | 400 | ||
| 405 | /* Notify any waiting subscriptions */ | 401 | /* Notify any waiting subscriptions */ |
| 406 | list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) { | 402 | list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) { |
| 407 | tipc_subscr_report_overlap(s, | 403 | tipc_subscrp_report_overlap(s, publ->lower, publ->upper, |
| 408 | publ->lower, | 404 | TIPC_WITHDRAWN, publ->ref, |
| 409 | publ->upper, | 405 | publ->node, removed_subseq); |
| 410 | TIPC_WITHDRAWN, | ||
| 411 | publ->ref, | ||
| 412 | publ->node, | ||
| 413 | removed_subseq); | ||
| 414 | } | 406 | } |
| 415 | 407 | ||
| 416 | return publ; | 408 | return publ; |
| @@ -432,19 +424,17 @@ static void tipc_nameseq_subscribe(struct name_seq *nseq, | |||
| 432 | return; | 424 | return; |
| 433 | 425 | ||
| 434 | while (sseq != &nseq->sseqs[nseq->first_free]) { | 426 | while (sseq != &nseq->sseqs[nseq->first_free]) { |
| 435 | if (tipc_subscr_overlap(s, sseq->lower, sseq->upper)) { | 427 | if (tipc_subscrp_check_overlap(s, sseq->lower, sseq->upper)) { |
| 436 | struct publication *crs; | 428 | struct publication *crs; |
| 437 | struct name_info *info = sseq->info; | 429 | struct name_info *info = sseq->info; |
| 438 | int must_report = 1; | 430 | int must_report = 1; |
| 439 | 431 | ||
| 440 | list_for_each_entry(crs, &info->zone_list, zone_list) { | 432 | list_for_each_entry(crs, &info->zone_list, zone_list) { |
| 441 | tipc_subscr_report_overlap(s, | 433 | tipc_subscrp_report_overlap(s, sseq->lower, |
| 442 | sseq->lower, | 434 | sseq->upper, |
| 443 | sseq->upper, | 435 | TIPC_PUBLISHED, |
| 444 | TIPC_PUBLISHED, | 436 | crs->ref, crs->node, |
| 445 | crs->ref, | 437 | must_report); |
| 446 | crs->node, | ||
| 447 | must_report); | ||
| 448 | must_report = 0; | 438 | must_report = 0; |
| 449 | } | 439 | } |
| 450 | } | 440 | } |