Thread (1 message) 1 message, 1 author, 2008-10-13

Re: [PATCH] wireless: build failure if !CONFIG_MAC80211_MESH

From: John W. Linville <hidden>
Date: 2008-10-13 16:36:42
Also in: linux-wireless

I think Dave already merged a patch from Ingo to resolve this issue?

On Mon, Oct 13, 2008 at 08:45:03AM -0700, Stephen Hemminger wrote:
quoted hunk
If mac80211 is configured, but MAC80211_MESH is not, then the build fails
because mesh_path_lookup and mesh_path_add are not defined. 
Compile tested only, fixes the build, but no idea if breaks something else.

Signed-off-by: Stephen Hemminger <redacted>

---
Also needed to stub out mpp_path_lookup
--- a/net/mac80211/mesh.h	2008-10-13 07:57:46.000000000 -0700
+++ b/net/mac80211/mesh.h	2008-10-13 08:42:31.000000000 -0700
@@ -225,11 +225,20 @@ void ieee80211_stop_mesh(struct ieee8021
 int mesh_nexthop_lookup(struct sk_buff *skb,
 		struct ieee80211_sub_if_data *sdata);
 void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata);
+#ifdef CONFIG_MAC80211_MESH
 struct mesh_path *mesh_path_lookup(u8 *dst,
 		struct ieee80211_sub_if_data *sdata);
 struct mesh_path *mpp_path_lookup(u8 *dst,
 				  struct ieee80211_sub_if_data *sdata);
+#else
+#define mesh_path_lookup(dst,sdata) (NULL)
+#define mpp_path_lookup(dst,sdata) (NULL)
+#endif
+#ifdef CONFIG_MAC80211_MESH
 int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata);
+#else
+#define mpp_path_add(dst, mpp, sdata) (-ENOTSUPP)
+#endif
 struct mesh_path *mesh_path_lookup_by_idx(int idx,
 		struct ieee80211_sub_if_data *sdata);
 void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop);
-- 
John W. Linville		Linux should be at the core
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			of your literate lifestyle.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help