diff --git a/[refs] b/[refs] index 6673a3e7ca58..376dda783407 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff9b662dab1fcd885fb728de3a8c13ebb5455117 +refs/heads/master: 18d7c65ba6628d2759bd650e7039d6307f2c99e9 diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h index 7f4df7c7659d..be456450cd2e 100644 --- a/trunk/include/linux/ieee80211.h +++ b/trunk/include/linux/ieee80211.h @@ -714,6 +714,7 @@ struct ieee80211_ht_addt_info { #define IEEE80211_HT_CAP_SGI_40 0x0040 #define IEEE80211_HT_CAP_DELAY_BA 0x0400 #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 +#define IEEE80211_HT_CAP_DSSSCCK40 0x1000 /* 802.11n HT capability AMPDU settings */ #define IEEE80211_HT_CAP_AMPDU_FACTOR 0x03 #define IEEE80211_HT_CAP_AMPDU_DENSITY 0x1C