diff options
Diffstat (limited to 'net/tipc/name_distr.c')
| -rw-r--r-- | net/tipc/name_distr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 98ebb37f1808..d57da6159616 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
| @@ -120,7 +120,7 @@ static void named_cluster_distribute(struct sk_buff *buf) | |||
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | buf_discard(buf); | 123 | kfree_skb(buf); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | /** | 126 | /** |
| @@ -239,9 +239,6 @@ exit: | |||
| 239 | * | 239 | * |
| 240 | * Invoked for each publication issued by a newly failed node. | 240 | * Invoked for each publication issued by a newly failed node. |
| 241 | * Removes publication structure from name table & deletes it. | 241 | * Removes publication structure from name table & deletes it. |
| 242 | * In rare cases the link may have come back up again when this | ||
| 243 | * function is called, and we have two items representing the same | ||
| 244 | * publication. Nudge this item's key to distinguish it from the other. | ||
| 245 | */ | 242 | */ |
| 246 | 243 | ||
| 247 | static void named_purge_publ(struct publication *publ) | 244 | static void named_purge_publ(struct publication *publ) |
| @@ -249,7 +246,6 @@ static void named_purge_publ(struct publication *publ) | |||
| 249 | struct publication *p; | 246 | struct publication *p; |
| 250 | 247 | ||
| 251 | write_lock_bh(&tipc_nametbl_lock); | 248 | write_lock_bh(&tipc_nametbl_lock); |
| 252 | publ->key += 1222345; | ||
| 253 | p = tipc_nametbl_remove_publ(publ->type, publ->lower, | 249 | p = tipc_nametbl_remove_publ(publ->type, publ->lower, |
| 254 | publ->node, publ->ref, publ->key); | 250 | publ->node, publ->ref, publ->key); |
| 255 | if (p) | 251 | if (p) |
| @@ -316,7 +312,7 @@ void tipc_named_recv(struct sk_buff *buf) | |||
| 316 | item++; | 312 | item++; |
| 317 | } | 313 | } |
| 318 | write_unlock_bh(&tipc_nametbl_lock); | 314 | write_unlock_bh(&tipc_nametbl_lock); |
| 319 | buf_discard(buf); | 315 | kfree_skb(buf); |
| 320 | } | 316 | } |
| 321 | 317 | ||
| 322 | /** | 318 | /** |
