Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ad20dd1 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211: rename mesh static path_lookup() 



If you want to use mesh support from mac80211 on a recent
kernel on 2.6.24 you'll run into a name clash when compiling
against include/linux/namei.h, so rename this routine.

/home/mcgrof/tmp/compat-wireless-3.2.5-1/net/mac80211/mesh_pathtbl.c: At top level:
/home/mcgrof/tmp/compat-wireless-3.2.5-1/net/mac80211/mesh_pathtbl.c:342:26: error: conflicting types for ‘path_lookup’
include/linux/namei.h:71:12: note: previous declaration of ‘path_lookup’ was here

Although this could sit as a separate patch in compat-wireless it seems
best to just merge upstream.

Cc: Javier Cardona <javier@cozybit.com>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@frijolero.org>
Acked-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7f66c2f9

net/mac80211/mesh_pathtbl.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -336,7 +336,7 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath, 
}

}









static struct mesh_path *path_lookup(struct mesh_table *tbl, u8 *dst,

static struct mesh_path *mpath_lookup(struct mesh_table *tbl, u8 *dst,

					  struct ieee80211_sub_if_data *sdata)

					  struct ieee80211_sub_if_data *sdata)

{

{

	struct mesh_path *mpath;

	struct mesh_path *mpath;
@@ -371,12 +371,12 @@ static struct mesh_path *path_lookup(struct mesh_table *tbl, u8 *dst, 
 */

 */

struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)

struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)

{

{

	return path_lookup(rcu_dereference(mesh_paths), dst, sdata);

	return mpath_lookup(rcu_dereference(mesh_paths), dst, sdata);

}

}





struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)

struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)

{

{

	return path_lookup(rcu_dereference(mpp_paths), dst, sdata);

	return mpath_lookup(rcu_dereference(mpp_paths), dst, sdata);

}

}