diff options
author | sam <sam@FreeBSD.org> | 2007-03-11 07:15:38 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2007-03-11 07:15:38 +0000 |
commit | a0ffc0834867892a7aace699b65132a9ee33110d (patch) | |
tree | 250562f8025aaea05de7282e567617a655f43b65 | |
parent | c8efce1b967630b0ef256c732ae3991bef23ce37 (diff) | |
download | FreeBSD-src-a0ffc0834867892a7aace699b65132a9ee33110d.zip FreeBSD-src-a0ffc0834867892a7aace699b65132a9ee33110d.tar.gz |
expose IEEE80211_DISCARD, IEEE80211_DISCARD_IE, and IEEE80211_DISCARD_MAC
so they can be used within net80211 but outside ieee80211_input.c
MFC after: 2 weeks
-rw-r--r-- | sys/net80211/ieee80211_input.c | 36 | ||||
-rw-r--r-- | sys/net80211/ieee80211_var.h | 31 |
2 files changed, 34 insertions, 33 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index f6796db..3b0c92b 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -73,38 +73,8 @@ doprint(struct ieee80211com *ic, int subtype) return 1; } -/* - * Emit a debug message about discarding a frame or information - * element. One format is for extracting the mac address from - * the frame header; the other is for when a header is not - * available or otherwise appropriate. - */ -#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_frame(_ic, _wh, _type, _fmt, __VA_ARGS__);\ -} while (0) -#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_ie(_ic, _wh, _type, _fmt, __VA_ARGS__);\ -} while (0) -#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) do { \ - if ((_ic)->ic_debug & (_m)) \ - ieee80211_discard_mac(_ic, _mac, _type, _fmt, __VA_ARGS__);\ -} while (0) - static const u_int8_t *ieee80211_getbssid(struct ieee80211com *, const struct ieee80211_frame *); -static void ieee80211_discard_frame(struct ieee80211com *, - const struct ieee80211_frame *, const char *type, const char *fmt, ...); -static void ieee80211_discard_ie(struct ieee80211com *, - const struct ieee80211_frame *, const char *type, const char *fmt, ...); -static void ieee80211_discard_mac(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, - const char *fmt, ...); -#else -#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) -#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) -#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) #endif /* IEEE80211_DEBUG */ static struct mbuf *ieee80211_defrag(struct ieee80211com *, @@ -2867,7 +2837,7 @@ ieee80211_note_mac(struct ieee80211com *ic, if_printf(ic->ic_ifp, "[%s] %s\n", ether_sprintf(mac), buf); } -static void +void ieee80211_discard_frame(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *type, const char *fmt, ...) @@ -2886,7 +2856,7 @@ ieee80211_discard_frame(struct ieee80211com *ic, printf("\n"); } -static void +void ieee80211_discard_ie(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *type, const char *fmt, ...) @@ -2905,7 +2875,7 @@ ieee80211_discard_ie(struct ieee80211com *ic, printf("\n"); } -static void +void ieee80211_discard_mac(struct ieee80211com *ic, const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, const char *fmt, ...) diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 482687c..1ebd6ef 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -419,12 +419,43 @@ void ieee80211_note_frame(struct ieee80211com *ic, ((_ic)->ic_debug & IEEE80211_MSG_SCAN) #define ieee80211_msg_assoc(_ic) \ ((_ic)->ic_debug & IEEE80211_MSG_ASSOC) + +/* + * Emit a debug message about discarding a frame or information + * element. One format is for extracting the mac address from + * the frame header; the other is for when a header is not + * available or otherwise appropriate. + */ +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_frame(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_ie(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_mac(_ic, _mac, _type, _fmt, __VA_ARGS__);\ +} while (0) + +void ieee80211_discard_frame(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +void ieee80211_discard_ie(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +void ieee80211_discard_mac(struct ieee80211com *, + const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, + const char *fmt, ...); #else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) #define IEEE80211_NOTE_FRAME(_ic, _m, _wh, _fmt, ...) #define IEEE80211_NOTE_MAC(_ic, _m, _mac, _fmt, ...) #define ieee80211_msg_dumppkts(_ic) 0 #define ieee80211_msg(_ic, _m) 0 + +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) #endif #endif /* _NET80211_IEEE80211_VAR_H_ */ |