diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/subscr.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index a6ce3bbf3eaf..11c9ae00837d 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c | |||
@@ -149,14 +149,6 @@ static void subscr_timeout(struct tipc_subscription *sub) | |||
149 | /* The spin lock per subscriber is used to protect its members */ | 149 | /* The spin lock per subscriber is used to protect its members */ |
150 | spin_lock_bh(&subscriber->lock); | 150 | spin_lock_bh(&subscriber->lock); |
151 | 151 | ||
152 | /* Validate if the connection related to the subscriber is | ||
153 | * closed (in case subscriber is terminating) | ||
154 | */ | ||
155 | if (subscriber->conid == 0) { | ||
156 | spin_unlock_bh(&subscriber->lock); | ||
157 | return; | ||
158 | } | ||
159 | |||
160 | /* Validate timeout (in case subscription is being cancelled) */ | 152 | /* Validate timeout (in case subscription is being cancelled) */ |
161 | if (sub->timeout == TIPC_WAIT_FOREVER) { | 153 | if (sub->timeout == TIPC_WAIT_FOREVER) { |
162 | spin_unlock_bh(&subscriber->lock); | 154 | spin_unlock_bh(&subscriber->lock); |
@@ -211,9 +203,6 @@ static void subscr_release(struct tipc_subscriber *subscriber) | |||
211 | 203 | ||
212 | spin_lock_bh(&subscriber->lock); | 204 | spin_lock_bh(&subscriber->lock); |
213 | 205 | ||
214 | /* Invalidate subscriber reference */ | ||
215 | subscriber->conid = 0; | ||
216 | |||
217 | /* Destroy any existing subscriptions for subscriber */ | 206 | /* Destroy any existing subscriptions for subscriber */ |
218 | list_for_each_entry_safe(sub, sub_temp, &subscriber->subscription_list, | 207 | list_for_each_entry_safe(sub, sub_temp, &subscriber->subscription_list, |
219 | subscription_list) { | 208 | subscription_list) { |