diff options
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 5df5fd74c6d1..0643fb6d47c4 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1089,12 +1089,14 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt, | |||
1089 | * Check to see if we resolved a queued list. If so we | 1089 | * Check to see if we resolved a queued list. If so we |
1090 | * need to send on the frames and tidy up. | 1090 | * need to send on the frames and tidy up. |
1091 | */ | 1091 | */ |
1092 | found = false; | ||
1092 | spin_lock_bh(&mfc_unres_lock); | 1093 | spin_lock_bh(&mfc_unres_lock); |
1093 | list_for_each_entry(uc, &mrt->mfc_unres_queue, list) { | 1094 | list_for_each_entry(uc, &mrt->mfc_unres_queue, list) { |
1094 | if (uc->mfc_origin == c->mfc_origin && | 1095 | if (uc->mfc_origin == c->mfc_origin && |
1095 | uc->mfc_mcastgrp == c->mfc_mcastgrp) { | 1096 | uc->mfc_mcastgrp == c->mfc_mcastgrp) { |
1096 | list_del(&uc->list); | 1097 | list_del(&uc->list); |
1097 | atomic_dec(&mrt->cache_resolve_queue_len); | 1098 | atomic_dec(&mrt->cache_resolve_queue_len); |
1099 | found = true; | ||
1098 | break; | 1100 | break; |
1099 | } | 1101 | } |
1100 | } | 1102 | } |
@@ -1102,7 +1104,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt, | |||
1102 | del_timer(&mrt->ipmr_expire_timer); | 1104 | del_timer(&mrt->ipmr_expire_timer); |
1103 | spin_unlock_bh(&mfc_unres_lock); | 1105 | spin_unlock_bh(&mfc_unres_lock); |
1104 | 1106 | ||
1105 | if (uc) { | 1107 | if (found) { |
1106 | ipmr_cache_resolve(net, mrt, uc, c); | 1108 | ipmr_cache_resolve(net, mrt, uc, c); |
1107 | ipmr_cache_free(uc); | 1109 | ipmr_cache_free(uc); |
1108 | } | 1110 | } |