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/cfp.c | |
| 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/cfp.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c index 2c3226bf86f8..0ddec3d4b059 100644 --- a/drivers/net/wireless/mwifiex/cfp.c +++ b/drivers/net/wireless/mwifiex/cfp.c | |||
| @@ -253,7 +253,7 @@ u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, | |||
| 253 | u8 index, u8 ht_info) | 253 | u8 index, u8 ht_info) |
| 254 | { | 254 | { |
| 255 | u32 mcs_num_supp = | 255 | u32 mcs_num_supp = |
| 256 | (priv->adapter->hw_dev_mcs_support == HT_STREAM_2X2) ? 16 : 8; | 256 | (priv->adapter->user_dev_mcs_support == HT_STREAM_2X2) ? 16 : 8; |
| 257 | u32 rate; | 257 | u32 rate; |
| 258 | 258 | ||
| 259 | if (priv->adapter->is_hw_11ac_capable) | 259 | if (priv->adapter->is_hw_11ac_capable) |