linux-next: manual merge of the akpm tree with the wireless-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/mac80211/mesh_pathtbl.c between commit bf7cd94dcc71 ("mac80211: clean
up mesh code") from the wireless-next tree and commit "hlist: drop the
node parameter from iterators" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc net/mac80211/mesh_pathtbl.c
index 6b3c4e1,ddf48f6..0000000
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@@ -455,27 -448,30 +452,27 @@@ err_rcu
   * @tbl: table which holds our list of known gates
   * @mpath: gate mpath
   *
 - * Returns: 0 on success
 - *
   * Locking: must be called inside rcu_read_lock() section
   */
 -static int mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath)
 +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) {
 -                      spin_lock_bh(&tbl->gates_lock);
 -                      hlist_del_rcu(&gate->list);
 -                      kfree_rcu(gate, rcu);
 -                      spin_unlock_bh(&tbl->gates_lock);
 -                      mpath->sdata->u.mesh.num_gates--;
 -                      mpath->is_gate = false;
 -                      mpath_dbg(mpath->sdata,
 -                                "Mesh path: Deleted gate: %pM. %d known 
gates\n",
 -                                mpath->dst, mpath->sdata->u.mesh.num_gates);
 -                      break;
 -              }
 -
 -      return 0;
++      hlist_for_each_entry_safe(gate, q, tbl->known_gates, list) {
 +              if (gate->mpath != mpath)
 +                      continue;
 +              spin_lock_bh(&tbl->gates_lock);
 +              hlist_del_rcu(&gate->list);
 +              kfree_rcu(gate, rcu);
 +              spin_unlock_bh(&tbl->gates_lock);
 +              mpath->sdata->u.mesh.num_gates--;
 +              mpath->is_gate = false;
 +              mpath_dbg(mpath->sdata,
 +                        "Mesh path: Deleted gate: %pM. %d known gates\n",
 +                        mpath->dst, mpath->sdata->u.mesh.num_gates);
 +              break;
 +      }
  }
  
  /**

pgpu0loY5peJo.pgp
Description: PGP signature