diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-13 14:21:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-13 14:21:43 -0400 |
| commit | 42775a34d23027b19e984956a539448f5e7ff075 (patch) | |
| tree | e344340c7f0aed4c8faf7534fabbc64607a8e784 /drivers/net/wireless/mwifiex/11n_rxreorder.h | |
| parent | 433131ba03c511a84e1fda5669c70cf8b44702e1 (diff) | |
| parent | 4e3b3bcd81776527fa6f11624d68849de8c8802e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n_rxreorder.h')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n_rxreorder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.h b/drivers/net/wireless/mwifiex/11n_rxreorder.h index 4064041ac852..0fc76e4a60f8 100644 --- a/drivers/net/wireless/mwifiex/11n_rxreorder.h +++ b/drivers/net/wireless/mwifiex/11n_rxreorder.h | |||
| @@ -42,7 +42,8 @@ | |||
| 42 | #define BA_SETUP_PACKET_OFFSET 16 | 42 | #define BA_SETUP_PACKET_OFFSET 16 |
| 43 | 43 | ||
| 44 | enum mwifiex_rxreor_flags { | 44 | enum mwifiex_rxreor_flags { |
| 45 | RXREOR_FORCE_NO_DROP = 1<<0, | 45 | RXREOR_FORCE_NO_DROP = 1<<0, |
| 46 | RXREOR_INIT_WINDOW_SHIFT = 1<<1, | ||
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 48 | static inline void mwifiex_reset_11n_rx_seq_num(struct mwifiex_private *priv) | 49 | static inline void mwifiex_reset_11n_rx_seq_num(struct mwifiex_private *priv) |