aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/lib80211.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-09-30 21:43:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:50 -0400
commit72118015271e6d3852cb9f647efe0987d131adaa (patch)
tree6cf548edeb3eb1d6c561fc78951096775de86b22 /include/net/lib80211.h
parent9387b7caf3049168fc97a8a9111af8fe2143af18 (diff)
wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts
There is quite a lot of overlap in definitions between these headers... Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/lib80211.h')
-rw-r--r--include/net/lib80211.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index 906d96f1b264..e1558a187ac0 100644
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -8,9 +8,11 @@
8#ifndef LIB80211_H 8#ifndef LIB80211_H
9#define LIB80211_H 9#define LIB80211_H
10 10
11#include <linux/ieee80211.h>
12
11/* print_ssid() is intended to be used in debug (and possibly error) 13/* print_ssid() is intended to be used in debug (and possibly error)
12 * messages. It should never be used for passing ssid to user space. */ 14 * messages. It should never be used for passing ssid to user space. */
13const char *print_ssid(char *buf, const char *ssid, u8 ssid_len); 15const char *print_ssid(char *buf, const char *ssid, u8 ssid_len);
14#define DECLARE_SSID_BUF(var) char var[32 * 4 + 1] __maybe_unused 16#define DECLARE_SSID_BUF(var) char var[IEEE80211_MAX_SSID_LEN * 4 + 1] __maybe_unused
15 17
16#endif /* LIB80211_H */ 18#endif /* LIB80211_H */