From: Javier Cardona <javier@cozybit.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Javier Cardona <javier@cozybit.com>,
Thomas Pedersen <thomas@cozybit.com>,
devel@lists.open80211s.org,
Johannes Berg <johannes@sipsolutions.net>,
linux-wireless@vger.kernel.org, jlopex@gmail.com
Subject: [PATCH v2 4/8] mac80211: Remove redundant mesh path expiration checks
Date: Fri, 26 Aug 2011 17:18:10 -0700 [thread overview]
Message-ID: <1314404294-4233-5-git-send-email-javier@cozybit.com> (raw)
In-Reply-To: <1314404294-4233-1-git-send-email-javier@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
---
net/mac80211/mesh_pathtbl.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index b895a7c..598249e 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -359,8 +359,7 @@ struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
if (MPATH_EXPIRED(mpath)) {
spin_lock_bh(&mpath->state_lock);
- if (MPATH_EXPIRED(mpath))
- mpath->flags &= ~MESH_PATH_ACTIVE;
+ mpath->flags &= ~MESH_PATH_ACTIVE;
spin_unlock_bh(&mpath->state_lock);
}
return mpath;
@@ -386,8 +385,7 @@ struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
if (MPATH_EXPIRED(mpath)) {
spin_lock_bh(&mpath->state_lock);
- if (MPATH_EXPIRED(mpath))
- mpath->flags &= ~MESH_PATH_ACTIVE;
+ mpath->flags &= ~MESH_PATH_ACTIVE;
spin_unlock_bh(&mpath->state_lock);
}
return mpath;
@@ -420,8 +418,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data
if (j++ == idx) {
if (MPATH_EXPIRED(node->mpath)) {
spin_lock_bh(&node->mpath->state_lock);
- if (MPATH_EXPIRED(node->mpath))
- node->mpath->flags &= ~MESH_PATH_ACTIVE;
+ node->mpath->flags &= ~MESH_PATH_ACTIVE;
spin_unlock_bh(&node->mpath->state_lock);
}
return node->mpath;
--
1.7.6
next prev parent reply other threads:[~2011-08-27 0:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 1:40 [PATCH 0/9] mesh fixes Thomas Pedersen
2011-08-25 1:40 ` [PATCH 1/9] mac80211: Fix RCU pointer dereference in mesh_path_discard_frame() Thomas Pedersen
2011-08-25 2:08 ` Johannes Berg
2011-08-25 18:16 ` Javier Cardona
2011-08-25 18:21 ` Johannes Berg
2011-08-25 18:45 ` Javier Cardona
2011-08-25 18:48 ` Johannes Berg
2011-08-25 19:04 ` Javier Cardona
2011-08-25 1:40 ` [PATCH 2/9] mac80211: Limit amount of HWMP frames and forwarded data packets in queues on mesh interfaces Thomas Pedersen
2011-08-25 5:08 ` Johannes Berg
2011-08-25 17:46 ` Javier Cardona
2011-08-25 1:40 ` [PATCH 3/9] mac80211: Remove mesh paths when an interface is removed Thomas Pedersen
2011-08-25 1:40 ` [PATCH 4/9] mac80211: Improve mpath state locking Thomas Pedersen
2011-08-25 1:40 ` [PATCH 5/9] mac80211: Remove redundant mesh path expiration checks Thomas Pedersen
2011-08-25 1:40 ` [PATCH 6/9] mac80211: Don't iterate twice over all mpaths when once in sufficient Thomas Pedersen
2011-08-25 1:40 ` [PATCH 7/9] mac80211: Consolidate {mesh,mpp}_path_flush into one function Thomas Pedersen
2011-08-25 1:40 ` [PATCH 8/9] mac80211: Don't take the mesh path resize lock when deleting an mpath Thomas Pedersen
2011-08-25 1:40 ` [PATCH 9/9] mac80211: Consolidate mesh path duplicated functions Thomas Pedersen
2011-08-27 0:18 ` [PATCH v2 0/8] mesh fixes Javier Cardona
2011-08-27 0:18 ` [PATCH v2 1/8] mac80211: Fix RCU pointer dereference in mesh_path_discard_frame() Javier Cardona
2011-08-27 0:18 ` [PATCH v2 2/8] mac80211: Remove mesh paths when an interface is removed Javier Cardona
2011-08-27 0:18 ` [PATCH v2 3/8] mac80211: Improve mpath state locking Javier Cardona
2011-08-27 0:18 ` Javier Cardona [this message]
2011-08-27 0:18 ` [PATCH v2 5/8] mac80211: Don't iterate twice over all mpaths when once in sufficient Javier Cardona
2011-08-27 0:18 ` [PATCH v2 6/8] mac80211: Consolidate {mesh,mpp}_path_flush into one function Javier Cardona
2011-08-29 13:49 ` Johannes Berg
2011-08-29 18:36 ` Javier Cardona
2011-08-29 18:38 ` Johannes Berg
2011-08-27 0:18 ` [PATCH v2 7/8] mac80211: Don't take the mesh path resize lock when deleting an mpath Javier Cardona
2011-08-29 13:49 ` Johannes Berg
2011-08-27 0:18 ` [PATCH v2 8/8] mac80211: Consolidate mesh path duplicated functions Javier Cardona
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314404294-4233-5-git-send-email-javier@cozybit.com \
--to=javier@cozybit.com \
--cc=devel@lists.open80211s.org \
--cc=jlopex@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=thomas@cozybit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.