diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-26 02:49:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-26 02:49:33 -0400 |
commit | a7513528cd0deeb62624c229c21054472ec976e6 (patch) | |
tree | 2e1f0ff78db589e53f260b7b3845e27e62b29ac8 /net | |
parent | 51f9cc1ff8aa0866ff8fb3c06be4c64b5edbb2e8 (diff) |
[TIPC]: Withdrawing all names from nameless port now returns success, not error
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/port.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c index 360920b3d821..899e08eac2ca 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
@@ -1171,8 +1171,6 @@ int tipc_withdraw(u32 ref, unsigned int scope, struct tipc_name_seq const *seq) | |||
1171 | p_ptr = tipc_port_lock(ref); | 1171 | p_ptr = tipc_port_lock(ref); |
1172 | if (!p_ptr) | 1172 | if (!p_ptr) |
1173 | return -EINVAL; | 1173 | return -EINVAL; |
1174 | if (!p_ptr->publ.published) | ||
1175 | goto exit; | ||
1176 | if (!seq) { | 1174 | if (!seq) { |
1177 | list_for_each_entry_safe(publ, tpubl, | 1175 | list_for_each_entry_safe(publ, tpubl, |
1178 | &p_ptr->publications, pport_list) { | 1176 | &p_ptr->publications, pport_list) { |
@@ -1199,7 +1197,6 @@ int tipc_withdraw(u32 ref, unsigned int scope, struct tipc_name_seq const *seq) | |||
1199 | } | 1197 | } |
1200 | if (list_empty(&p_ptr->publications)) | 1198 | if (list_empty(&p_ptr->publications)) |
1201 | p_ptr->publ.published = 0; | 1199 | p_ptr->publ.published = 0; |
1202 | exit: | ||
1203 | tipc_port_unlock(p_ptr); | 1200 | tipc_port_unlock(p_ptr); |
1204 | return res; | 1201 | return res; |
1205 | } | 1202 | } |