From: Luis Carlos Cobo <luisca@cozybit.com>
Date: Sat, 1 Mar 2008 01:51:25 +0000 (-0800)
Subject: mac80211: fix mesh_path and sta_info get_by_idx functions
X-Git-Tag: v2.6.26-rc1~1138^2~454^2~45
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a8ca29a88e3858685c463ffd19e11c20d14c73a;p=linux-2.6

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>
---

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 135022d7ee..5845dc21ce 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -98,7 +98,7 @@ struct mesh_path *mesh_path_lookup(u8 *dst, struct net_device *dev)
 /**
  * mesh_path_lookup_by_idx - look up a path in the mesh path table by its index
  * @idx: index
- * @dev: local interface
+ * @dev: local interface, or NULL for all entries
  *
  * Returns: pointer to the mesh path structure, or NULL if not found.
  *
@@ -111,7 +111,9 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
 	int i;
 	int j = 0;
 
-	for_each_mesh_entry(mesh_paths, p, node, i)
+	for_each_mesh_entry(mesh_paths, p, node, i) {
+		if (dev && node->mpath->dev != dev)
+			continue;
 		if (j++ == idx) {
 			if (MPATH_EXPIRED(node->mpath)) {
 				spin_lock_bh(&node->mpath->state_lock);
@@ -121,6 +123,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
 			}
 			return node->mpath;
 		}
+	}
 
 	return NULL;
 }
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index e27f896dae..3b84c16cf0 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,
 	int i = 0;
 
 	list_for_each_entry_rcu(sta, &local->sta_list, list) {
+		if (dev && dev != sta->sdata->dev)
+			continue;
 		if (i < idx) {
 			++i;
 			continue;
-		} else if (!dev || dev == sta->sdata->dev) {
-			return sta;
 		}
+		return sta;
 	}
 
 	return NULL;