summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorJohannes Berg2008-02-25 16:24:38 +0100
committerJohn W. Linville2008-03-06 21:30:46 +0100
commitd6d1a5a7096172a1592115331a420630adf47f8c (patch)
tree4c5ead46ee39eb3693bd313243222692b5f9fc66 /net/mac80211/sta_info.h
parentmac80211: export mesh_plink_broken (diff)
downloadkernel-qcow2-linux-d6d1a5a7096172a1592115331a420630adf47f8c.tar.gz
kernel-qcow2-linux-d6d1a5a7096172a1592115331a420630adf47f8c.tar.xz
kernel-qcow2-linux-d6d1a5a7096172a1592115331a420630adf47f8c.zip
mac80211: clean up mesh RX path a bit more
Moves another ifdef into the sta_info header file in favour of compiling more code even w/o CONFIG_MAC80211_MESH. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: Luis Carlos Cobo <luisca@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r--net/mac80211/sta_info.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 4ad500373d5a..4d0840b8c58e 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -235,6 +235,14 @@ struct sta_info {
#endif
};
+static inline enum plink_state sta_plink_state(struct sta_info *sta)
+{
+#ifdef CONFIG_MAC80211_MESH
+ return sta->plink_state;
+#endif
+ return LISTEN;
+}
+
/* Maximum number of concurrently registered stations */
#define MAX_STA_COUNT 2007