diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-02-23 15:17:19 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-06 15:30:42 -0500 |
| commit | 902acc7896d7649fb30e4b22bd4e643c7f34b02c (patch) | |
| tree | 8d8f2838fead8417e16e801383ddb2691a89719f /net/mac80211/mesh.h | |
| parent | f7a921443740d7dafc65b17aa32531730d358f50 (diff) | |
| download | kernel_samsung_aries-902acc7896d7649fb30e4b22bd4e643c7f34b02c.zip kernel_samsung_aries-902acc7896d7649fb30e4b22bd4e643c7f34b02c.tar.gz kernel_samsung_aries-902acc7896d7649fb30e4b22bd4e643c7f34b02c.tar.bz2 | |
mac80211: clean up mesh code
Various cleanups, reducing the #ifdef mess and other things.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh.h')
| -rw-r--r-- | net/mac80211/mesh.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index ac89237..d565b3f 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -11,10 +11,10 @@ #ifndef IEEE80211S_H #define IEEE80211S_H -#include "ieee80211_i.h" +#include <linux/types.h> #include <linux/jhash.h> +#include "ieee80211_i.h" -extern int mesh_allocated; /* Data structures */ @@ -211,6 +211,8 @@ void mesh_rmc_free(struct net_device *dev); int mesh_rmc_init(struct net_device *dev); void ieee80211s_init(void); void ieee80211s_stop(void); +void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata); + /* Mesh paths */ int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb, struct net_device *dev); @@ -257,6 +259,9 @@ void mesh_path_timer(unsigned long data); void mesh_path_flush_by_nexthop(struct sta_info *sta); void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev); +#ifdef CONFIG_MAC80211_MESH +extern int mesh_allocated; + static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata) { return sdata->u.sta.mshcfg.dot11MeshMaxPeerLinks - @@ -278,6 +283,10 @@ static inline void mesh_path_activate(struct mesh_path *mpath) for (i = 0; i <= x->hash_mask; i++) \ hlist_for_each_entry_rcu(node, p, &x->hash_buckets[i], list) +#else +#define mesh_allocated 0 +#endif + #define MESH_PREQ(skb) (skb->cb + 30) #endif /* IEEE80211S_H */ |