summaryrefslogtreecommitdiff
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-28 18:36:09 +0400
committerJohn W. Linville <linville@tuxdriver.com>2013-08-28 18:36:09 +0400
commitb35c809708ad245a36bef94d6fb1e83f6ab850aa (patch)
treec6dc6580546c9a5997eae06c8409f986c383d2a4 /include/net/mac80211.h
parent6e956da2027c767859128b9bfef085cf2a8e233b (diff)
parent19c361608ce3e73f352e323262f7e0a8264be3af (diff)
downloadlinux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c net/mac80211/ibss.c
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e3e303778936..4be8785332b1 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1521,6 +1521,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24,
IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26,
+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27,
};
/**