diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-09-30 20:59:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:50 -0400 |
commit | 9387b7caf3049168fc97a8a9111af8fe2143af18 (patch) | |
tree | 6a19e5477d6a6badf19788536a9d3e1913ae48e1 /include | |
parent | 2819f8ad6da1e24b5dd94a221978e61f2a9c972a (diff) | |
download | linux-3.10-9387b7caf3049168fc97a8a9111af8fe2143af18.tar.gz linux-3.10-9387b7caf3049168fc97a8a9111af8fe2143af18.tar.bz2 linux-3.10-9387b7caf3049168fc97a8a9111af8fe2143af18.zip |
wireless: use individual buffers for printing ssid values
Also change escape_ssid to print_ssid to match print_mac semantics.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ieee80211.h | 6 | ||||
-rw-r--r-- | include/net/lib80211.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 64a4abce6d9..b0726e2079b 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -12,8 +12,8 @@ * published by the Free Software Foundation. */ -#ifndef IEEE80211_H -#define IEEE80211_H +#ifndef LINUX_IEEE80211_H +#define LINUX_IEEE80211_H #include <linux/types.h> #include <asm/byteorder.h> @@ -1114,4 +1114,4 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr) return hdr->addr1; } -#endif /* IEEE80211_H */ +#endif /* LINUX_IEEE80211_H */ diff --git a/include/net/lib80211.h b/include/net/lib80211.h index ce49a30033b..906d96f1b26 100644 --- a/include/net/lib80211.h +++ b/include/net/lib80211.h @@ -8,8 +8,9 @@ #ifndef LIB80211_H #define LIB80211_H -/* escape_ssid() is intended to be used in debug (and possibly error) +/* print_ssid() is intended to be used in debug (and possibly error) * messages. It should never be used for passing ssid to user space. */ -const char *escape_ssid(const char *ssid, u8 ssid_len); +const char *print_ssid(char *buf, const char *ssid, u8 ssid_len); +#define DECLARE_SSID_BUF(var) char var[32 * 4 + 1] __maybe_unused #endif /* LIB80211_H */ |