aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r--net/mac80211/mesh_pathtbl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 135022d7ee57..5845dc21ce85 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)
98/** 98/**
99 * mesh_path_lookup_by_idx - look up a path in the mesh path table by its index 99 * mesh_path_lookup_by_idx - look up a path in the mesh path table by its index
100 * @idx: index 100 * @idx: index
101 * @dev: local interface 101 * @dev: local interface, or NULL for all entries
102 * 102 *
103 * Returns: pointer to the mesh path structure, or NULL if not found. 103 * Returns: pointer to the mesh path structure, or NULL if not found.
104 * 104 *
@@ -111,7 +111,9 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
111 int i; 111 int i;
112 int j = 0; 112 int j = 0;
113 113
114 for_each_mesh_entry(mesh_paths, p, node, i) 114 for_each_mesh_entry(mesh_paths, p, node, i) {
115 if (dev && node->mpath->dev != dev)
116 continue;
115 if (j++ == idx) { 117 if (j++ == idx) {
116 if (MPATH_EXPIRED(node->mpath)) { 118 if (MPATH_EXPIRED(node->mpath)) {
117 spin_lock_bh(&node->mpath->state_lock); 119 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)
121 } 123 }
122 return node->mpath; 124 return node->mpath;
123 } 125 }
126 }
124 127
125 return NULL; 128 return NULL;
126} 129}