diff options
author | David S. Miller <davem@davemloft.net> | 2014-01-10 14:53:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-10 14:53:33 -0500 |
commit | 1a6c1e5bd20793e35364280e7df5abd155ef057f (patch) | |
tree | 6d71eecd8ab3fa600d169088c453be43a77709ae /drivers/net/wireless/brcm80211/include/brcmu_wifi.h | |
parent | ef8570d859a5872db525ec1464165352e4f2bdaa (diff) | |
parent | 235f93922878234f3d99a4205ebe3634ee955919 (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
Please pull these updates for the 3.14 stream!
For the mac80211 bits, Johannes says:
"Felix adds some helper functions for P2P NoA software tracking, Joe
fixes alignment (but as this apparently never caused issues I didn't
send it to 3.13), Kyeyoon/Jouni add QoS-mapping support (a Hotspot 2.0
feature), Weilong fixed a bunch of checkpatch errors and I get to play
fire-fighter or so and clean up other people's locking issues. I also
added nl80211 vendor-specific events, as we'd discussed at the wireless
summit."
For the iwlwifi bits, Emmanuel says:
"I have here a rework of the interrupt handling to meet RT kernel
requirements - basically we don't take any lock in the primary interrupt
handler. This gave me a good reason to clean things up a bit on the way.
There is also a fix of the QoS mapping along with a few workarounds for
hardware / firmware issues that are hard to hit.
Three fixes suggested by static analyzers, and other various stuff.
Most importantly, I update the Copyright note to include the new year."
For the bluetooth bits, Gustavo says:
"More patches to 3.14. The bulk of changes here is the 6LoWPAN support for
Bluetooth LE Devices. The commits that touches net/ieee802154/ are already
acked by David Miller. Other than that we have some RFCOMM fixes and
improvements plus fixes and clean ups all over the tree."
Beyond that, ath9k, brcmfmac, mwifiex, and wil6210 get their usual
level of attention. The wl1251 driver gets a number of updates,
and there are a handful of other bits here and there.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/brcm80211/include/brcmu_wifi.h')
-rw-r--r-- | drivers/net/wireless/brcm80211/include/brcmu_wifi.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h index 0505cc065e0d..7ca2aa1035b2 100644 --- a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h +++ b/drivers/net/wireless/brcm80211/include/brcmu_wifi.h | |||
@@ -82,6 +82,20 @@ | |||
82 | #define WLC_N_BW_40ALL 1 | 82 | #define WLC_N_BW_40ALL 1 |
83 | #define WLC_N_BW_20IN2G_40IN5G 2 | 83 | #define WLC_N_BW_20IN2G_40IN5G 2 |
84 | 84 | ||
85 | #define WLC_BW_20MHZ_BIT BIT(0) | ||
86 | #define WLC_BW_40MHZ_BIT BIT(1) | ||
87 | #define WLC_BW_80MHZ_BIT BIT(2) | ||
88 | #define WLC_BW_160MHZ_BIT BIT(3) | ||
89 | |||
90 | /* Bandwidth capabilities */ | ||
91 | #define WLC_BW_CAP_20MHZ (WLC_BW_20MHZ_BIT) | ||
92 | #define WLC_BW_CAP_40MHZ (WLC_BW_40MHZ_BIT|WLC_BW_20MHZ_BIT) | ||
93 | #define WLC_BW_CAP_80MHZ (WLC_BW_80MHZ_BIT|WLC_BW_40MHZ_BIT| \ | ||
94 | WLC_BW_20MHZ_BIT) | ||
95 | #define WLC_BW_CAP_160MHZ (WLC_BW_160MHZ_BIT|WLC_BW_80MHZ_BIT| \ | ||
96 | WLC_BW_40MHZ_BIT|WLC_BW_20MHZ_BIT) | ||
97 | #define WLC_BW_CAP_UNRESTRICTED 0xFF | ||
98 | |||
85 | /* band types */ | 99 | /* band types */ |
86 | #define WLC_BAND_AUTO 0 /* auto-select */ | 100 | #define WLC_BAND_AUTO 0 /* auto-select */ |
87 | #define WLC_BAND_5G 1 /* 5 Ghz */ | 101 | #define WLC_BAND_5G 1 /* 5 Ghz */ |