diff options
Diffstat (limited to 'include/net/ieee80211.h')
-rw-r--r-- | include/net/ieee80211.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 164d13211165..285b2adfa648 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -115,8 +115,16 @@ extern u32 ieee80211_debug_level; | |||
115 | do { if (ieee80211_debug_level & (level)) \ | 115 | do { if (ieee80211_debug_level & (level)) \ |
116 | printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ | 116 | printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ |
117 | in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) | 117 | in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) |
118 | static inline bool ieee80211_ratelimit_debug(u32 level) | ||
119 | { | ||
120 | return (ieee80211_debug_level & level) && net_ratelimit(); | ||
121 | } | ||
118 | #else | 122 | #else |
119 | #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) | 123 | #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) |
124 | static inline bool ieee80211_ratelimit_debug(u32 level) | ||
125 | { | ||
126 | return false; | ||
127 | } | ||
120 | #endif /* CONFIG_IEEE80211_DEBUG */ | 128 | #endif /* CONFIG_IEEE80211_DEBUG */ |
121 | 129 | ||
122 | /* escape_essid() is intended to be used in debug (and possibly error) | 130 | /* escape_essid() is intended to be used in debug (and possibly error) |
@@ -669,7 +677,7 @@ struct ieee80211_probe_request { | |||
669 | 677 | ||
670 | struct ieee80211_probe_response { | 678 | struct ieee80211_probe_response { |
671 | struct ieee80211_hdr_3addr header; | 679 | struct ieee80211_hdr_3addr header; |
672 | u32 time_stamp[2]; | 680 | __le32 time_stamp[2]; |
673 | __le16 beacon_interval; | 681 | __le16 beacon_interval; |
674 | __le16 capability; | 682 | __le16 capability; |
675 | /* SSID, supported rates, FH params, DS params, | 683 | /* SSID, supported rates, FH params, DS params, |
@@ -710,8 +718,8 @@ struct ieee80211_txb { | |||
710 | u8 encrypted; | 718 | u8 encrypted; |
711 | u8 rts_included; | 719 | u8 rts_included; |
712 | u8 reserved; | 720 | u8 reserved; |
713 | __le16 frag_size; | 721 | u16 frag_size; |
714 | __le16 payload_size; | 722 | u16 payload_size; |
715 | struct sk_buff *fragments[0]; | 723 | struct sk_buff *fragments[0]; |
716 | }; | 724 | }; |
717 | 725 | ||