diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-31 23:18:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-31 23:18:35 +0300 |
| commit | 99a49ce613057f1934e1c378808374fd683b1541 (patch) | |
| tree | 22366b2ed170e9e8c82fd3133457ab7834a15139 /drivers/net/wireless/rtlwifi/rtl8192se/def.h | |
| parent | 1e5c4bc497c0a96e1ad2974539d353870f2cb0b6 (diff) | |
| parent | 75a916e1944fea8347d2245c62567187e4eff9dd (diff) | |
| download | linux-99a49ce613057f1934e1c378808374fd683b1541.tar.xz | |
Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-10-31
Please pull this small batch of spooky fixes intended for the 3.18
stream...boo!
Cyril Brulebois adds an rt2x00 device ID.
Dan Carpenter provides a one-line masking fix for an ath9k debugfs
entry.
Larry Finger gives us a package of small rtlwifi fixes which add some
bits that were left out of some feature updates that were included
in the merge window. Hopefully this isn't a sign that the rtlwifi
base is getting too big...
Marc Yang brings a fix for a temporary mwifiex stall when doing 11n
RX reordering.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/def.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h index 83c98674bfd3..6e7a70b43949 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h @@ -446,6 +446,8 @@ /* DWORD 6 */ #define SET_RX_STATUS__DESC_BUFF_ADDR(__pdesc, __val) \ SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) +#define GET_RX_STATUS_DESC_BUFF_ADDR(__pdesc) \ + SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32) #define SE_RX_HAL_IS_CCK_RATE(_pdesc)\ (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \ |