|
|
@ -23,7 +23,7 @@ v9: use SM/MS macros from code.h to simplify shift/mask handling |
|
|
|
3 files changed, 52 insertions(+), 23 deletions(-)
|
|
|
|
3 files changed, 52 insertions(+), 23 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
|
--- a/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
|
@@ -2469,7 +2469,7 @@ static void ath10k_peer_assoc_h_vht(stru
|
|
|
|
@@ -2473,7 +2473,7 @@ static void ath10k_peer_assoc_h_vht(stru
|
|
|
|
const u16 *vht_mcs_mask;
|
|
|
|
const u16 *vht_mcs_mask;
|
|
|
|
u8 ampdu_factor;
|
|
|
|
u8 ampdu_factor;
|
|
|
|
u8 max_nss, vht_mcs;
|
|
|
|
u8 max_nss, vht_mcs;
|
|
|
@ -32,7 +32,7 @@ v9: use SM/MS macros from code.h to simplify shift/mask handling |
|
|
|
|
|
|
|
|
|
|
|
if (WARN_ON(ath10k_mac_vif_chan(vif, &def)))
|
|
|
|
if (WARN_ON(ath10k_mac_vif_chan(vif, &def)))
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@@ -2529,23 +2529,45 @@ static void ath10k_peer_assoc_h_vht(stru
|
|
|
|
@@ -2533,23 +2533,45 @@ static void ath10k_peer_assoc_h_vht(stru
|
|
|
|
__le16_to_cpu(vht_cap->vht_mcs.tx_highest);
|
|
|
|
__le16_to_cpu(vht_cap->vht_mcs.tx_highest);
|
|
|
|
arg->peer_vht_rates.tx_mcs_set = ath10k_peer_assoc_h_vht_limit(
|
|
|
|
arg->peer_vht_rates.tx_mcs_set = ath10k_peer_assoc_h_vht_limit(
|
|
|
|
__le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map), vht_mcs_mask);
|
|
|
|
__le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map), vht_mcs_mask);
|
|
|
@ -92,7 +92,7 @@ v9: use SM/MS macros from code.h to simplify shift/mask handling |
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
|
|
|
|
static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
|
|
|
|
@@ -2697,9 +2719,9 @@ static int ath10k_peer_assoc_prepare(str
|
|
|
|
@@ -2701,9 +2723,9 @@ static int ath10k_peer_assoc_prepare(str
|
|
|
|
ath10k_peer_assoc_h_crypto(ar, vif, sta, arg);
|
|
|
|
ath10k_peer_assoc_h_crypto(ar, vif, sta, arg);
|
|
|
|
ath10k_peer_assoc_h_rates(ar, vif, sta, arg);
|
|
|
|
ath10k_peer_assoc_h_rates(ar, vif, sta, arg);
|
|
|
|
ath10k_peer_assoc_h_ht(ar, vif, sta, arg);
|
|
|
|
ath10k_peer_assoc_h_ht(ar, vif, sta, arg);
|
|
|
|