diff options
author | Luis Carlos Cobo <luisca@cozybit.com> | 2008-02-29 20:51:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-06 16:40:54 -0500 |
commit | 2a8ca29a88e3858685c463ffd19e11c20d14c73a (patch) | |
tree | 78a3cd986d5b136d721b88ef7ee3c1c41374e887 /net/mac80211/sta_info.c | |
parent | a00de5d08b4bcd1e95d02667029406224bd0619b (diff) |
mac80211: fix mesh_path and sta_info get_by_idx functions
Skip properly entries whose dev does not match.
Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index e27f896dae53..3b84c16cf054 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
@@ -115,12 +115,13 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_local *local, int idx, | |||
115 | int i = 0; | 115 | int i = 0; |
116 | 116 | ||
117 | list_for_each_entry_rcu(sta, &local->sta_list, list) { | 117 | list_for_each_entry_rcu(sta, &local->sta_list, list) { |
118 | if (dev && dev != sta->sdata->dev) | ||
119 | continue; | ||
118 | if (i < idx) { | 120 | if (i < idx) { |
119 | ++i; | 121 | ++i; |
120 | continue; | 122 | continue; |
121 | } else if (!dev || dev == sta->sdata->dev) { | ||
122 | return sta; | ||
123 | } | 123 | } |
124 | return sta; | ||
124 | } | 125 | } |
125 | 126 | ||
126 | return NULL; | 127 | return NULL; |