Merge branch 'master' of git://github.com/chunkeey/carl9170fw

[carl9170fw.git] / include / linux / ieee80211.h

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index acef0deaff5a8c32f846b1dbd7b552c023fcae73..1b41d5d9f38eeaabc631fa7493eb78cd4cab93fe 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1760,6 +1760,8 @@ enum ieee80211_tdls_actioncode {
 #define WLAN_EXT_CAPA5_TDLS_ENABLED    BIT(5)
 #define WLAN_EXT_CAPA5_TDLS_PROHIBITED BIT(6)
 
+#define WLAN_EXT_CAPA8_OPMODE_NOTIF    BIT(6)
+
 /* TDLS specific payload type in the LLC/SNAP header */
 #define WLAN_TDLS_SNAP_RFTYPE  0x2
 
@@ -2133,7 +2135,7 @@ static inline unsigned long ieee80211_tu_to_usec(unsigned long tu)
  * @tim_len: length of the TIM IE
  * @aid: the AID to look for
  */
-static inline bool ieee80211_check_tim(struct ieee80211_tim_ie *tim,
+static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,
                                       u8 tim_len, u16 aid)
 {
        u8 mask;