+++ /dev/null
---- a/net/mac80211/mesh_pathtbl.c
-+++ b/net/mac80211/mesh_pathtbl.c
-@@ -72,9 +72,9 @@ static inline struct mesh_table *resize_
- * it's used twice. So it is illegal to do
- * for_each_mesh_entry(rcu_dereference(...), ...)
- */
--#define for_each_mesh_entry(tbl, p, node, i) \
-+#define for_each_mesh_entry(tbl, node, i) \
- for (i = 0; i <= tbl->hash_mask; i++) \
-- hlist_for_each_entry_rcu(node, p, &tbl->hash_buckets[i], list)
-+ hlist_for_each_entry_rcu(node, &tbl->hash_buckets[i], list)
-
-
- static struct mesh_table *mesh_table_alloc(int size_order)
-@@ -139,7 +139,7 @@ static void mesh_table_free(struct mesh_
- }
- if (free_leafs) {
- spin_lock_bh(&tbl->gates_lock);
-- hlist_for_each_entry_safe(gate, p, q,
-+ hlist_for_each_entry_safe(gate, q,
- tbl->known_gates, list) {
- hlist_del(&gate->list);
- kfree(gate);
-@@ -333,12 +333,11 @@ static struct mesh_path *mpath_lookup(st
- struct ieee80211_sub_if_data *sdata)
- {
- struct mesh_path *mpath;
-- struct hlist_node *n;
- struct hlist_head *bucket;
- struct mpath_node *node;
-
- bucket = &tbl->hash_buckets[mesh_table_hash(dst, sdata, tbl)];
-- hlist_for_each_entry_rcu(node, n, bucket, list) {
-+ hlist_for_each_entry_rcu(node, bucket, list) {
- mpath = node->mpath;
- if (mpath->sdata == sdata &&
- ether_addr_equal(dst, mpath->dst)) {
-@@ -389,11 +388,10 @@ mesh_path_lookup_by_idx(struct ieee80211
- {
- struct mesh_table *tbl = rcu_dereference(mesh_paths);
- struct mpath_node *node;
-- struct hlist_node *p;
- int i;
- int j = 0;
-
-- for_each_mesh_entry(tbl, p, node, i) {
-+ for_each_mesh_entry(tbl, node, i) {
- if (sdata && node->mpath->sdata != sdata)
- continue;
- if (j++ == idx) {
-@@ -417,13 +415,12 @@ int mesh_path_add_gate(struct mesh_path
- {
- struct mesh_table *tbl;
- struct mpath_node *gate, *new_gate;
-- struct hlist_node *n;
- int err;
-
- rcu_read_lock();
- tbl = rcu_dereference(mesh_paths);
-
-- hlist_for_each_entry_rcu(gate, n, tbl->known_gates, list)
-+ hlist_for_each_entry_rcu(gate, tbl->known_gates, list)
- if (gate->mpath == mpath) {
- err = -EEXIST;
- goto err_rcu;
-@@ -460,9 +457,9 @@ err_rcu:
- static void mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath)
- {
- struct mpath_node *gate;
-- struct hlist_node *p, *q;
-+ struct hlist_node *q;
-
-- hlist_for_each_entry_safe(gate, p, q, tbl->known_gates, list) {
-+ hlist_for_each_entry_safe(gate, q, tbl->known_gates, list) {
- if (gate->mpath != mpath)
- continue;
- spin_lock_bh(&tbl->gates_lock);
-@@ -504,7 +501,6 @@ int mesh_path_add(struct ieee80211_sub_i
- struct mesh_path *mpath, *new_mpath;
- struct mpath_node *node, *new_node;
- struct hlist_head *bucket;
-- struct hlist_node *n;
- int grow = 0;
- int err = 0;
- u32 hash_idx;
-@@ -550,7 +546,7 @@ int mesh_path_add(struct ieee80211_sub_i
- spin_lock(&tbl->hashwlock[hash_idx]);
-
- err = -EEXIST;
-- hlist_for_each_entry(node, n, bucket, list) {
-+ hlist_for_each_entry(node, bucket, list) {
- mpath = node->mpath;
- if (mpath->sdata == sdata &&
- ether_addr_equal(dst, mpath->dst))
-@@ -640,7 +636,6 @@ int mpp_path_add(struct ieee80211_sub_if
- struct mesh_path *mpath, *new_mpath;
- struct mpath_node *node, *new_node;
- struct hlist_head *bucket;
-- struct hlist_node *n;
- int grow = 0;
- int err = 0;
- u32 hash_idx;
-@@ -680,7 +675,7 @@ int mpp_path_add(struct ieee80211_sub_if
- spin_lock(&tbl->hashwlock[hash_idx]);
-
- err = -EEXIST;
-- hlist_for_each_entry(node, n, bucket, list) {
-+ hlist_for_each_entry(node, bucket, list) {
- mpath = node->mpath;
- if (mpath->sdata == sdata &&
- ether_addr_equal(dst, mpath->dst))
-@@ -725,14 +720,13 @@ void mesh_plink_broken(struct sta_info *
- static const u8 bcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
- struct mesh_path *mpath;
- struct mpath_node *node;
-- struct hlist_node *p;
- struct ieee80211_sub_if_data *sdata = sta->sdata;
- int i;
- __le16 reason = cpu_to_le16(WLAN_REASON_MESH_PATH_DEST_UNREACHABLE);
-
- rcu_read_lock();
- tbl = rcu_dereference(mesh_paths);
-- for_each_mesh_entry(tbl, p, node, i) {
-+ for_each_mesh_entry(tbl, node, i) {
- mpath = node->mpath;
- if (rcu_dereference(mpath->next_hop) == sta &&
- mpath->flags & MESH_PATH_ACTIVE &&
-@@ -792,13 +786,12 @@ void mesh_path_flush_by_nexthop(struct s
- struct mesh_table *tbl;
- struct mesh_path *mpath;
- struct mpath_node *node;
-- struct hlist_node *p;
- int i;
-
- rcu_read_lock();
- read_lock_bh(&pathtbl_resize_lock);
- tbl = resize_dereference_mesh_paths();
-- for_each_mesh_entry(tbl, p, node, i) {
-+ for_each_mesh_entry(tbl, node, i) {
- mpath = node->mpath;
- if (rcu_dereference(mpath->next_hop) == sta) {
- spin_lock(&tbl->hashwlock[i]);
-@@ -815,11 +808,9 @@ static void table_flush_by_iface(struct
- {
- struct mesh_path *mpath;
- struct mpath_node *node;
-- struct hlist_node *p;
- int i;
-
-- WARN_ON(!rcu_read_lock_held());
-- for_each_mesh_entry(tbl, p, node, i) {
-+ for_each_mesh_entry(tbl, node, i) {
- mpath = node->mpath;
- if (mpath->sdata != sdata)
- continue;
-@@ -865,7 +856,6 @@ int mesh_path_del(struct ieee80211_sub_i
- struct mesh_path *mpath;
- struct mpath_node *node;
- struct hlist_head *bucket;
-- struct hlist_node *n;
- int hash_idx;
- int err = 0;
-
-@@ -875,7 +865,7 @@ int mesh_path_del(struct ieee80211_sub_i
- bucket = &tbl->hash_buckets[hash_idx];
-
- spin_lock(&tbl->hashwlock[hash_idx]);
-- hlist_for_each_entry(node, n, bucket, list) {
-+ hlist_for_each_entry(node, bucket, list) {
- mpath = node->mpath;
- if (mpath->sdata == sdata &&
- ether_addr_equal(addr, mpath->dst)) {
-@@ -920,7 +910,6 @@ void mesh_path_tx_pending(struct mesh_pa
- int mesh_path_send_to_gates(struct mesh_path *mpath)
- {
- struct ieee80211_sub_if_data *sdata = mpath->sdata;
-- struct hlist_node *n;
- struct mesh_table *tbl;
- struct mesh_path *from_mpath = mpath;
- struct mpath_node *gate = NULL;
-@@ -935,7 +924,7 @@ int mesh_path_send_to_gates(struct mesh_
- if (!known_gates)
- return -EHOSTUNREACH;
-
-- hlist_for_each_entry_rcu(gate, n, known_gates, list) {
-+ hlist_for_each_entry_rcu(gate, known_gates, list) {
- if (gate->mpath->sdata != sdata)
- continue;
-
-@@ -951,7 +940,7 @@ int mesh_path_send_to_gates(struct mesh_
- }
- }
-
-- hlist_for_each_entry_rcu(gate, n, known_gates, list)
-+ hlist_for_each_entry_rcu(gate, known_gates, list)
- if (gate->mpath->sdata == sdata) {
- mpath_dbg(sdata, "Sending to %pM\n", gate->mpath->dst);
- mesh_path_tx_pending(gate->mpath);
-@@ -1096,12 +1085,11 @@ void mesh_path_expire(struct ieee80211_s
- struct mesh_table *tbl;
- struct mesh_path *mpath;
- struct mpath_node *node;
-- struct hlist_node *p;
- int i;
-
- rcu_read_lock();
- tbl = rcu_dereference(mesh_paths);
-- for_each_mesh_entry(tbl, p, node, i) {
-+ for_each_mesh_entry(tbl, node, i) {
- if (node->mpath->sdata != sdata)
- continue;
- mpath = node->mpath;
projects / openwrt / svn-archive / archive.git / blobdiff