diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-14 21:27:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 21:27:26 +0300 |
| commit | d96ec97511149b447712a5a401b290913cbd4426 (patch) | |
| tree | de04d00e75435f57607e1fe99f1339234b0b27ca /drivers/net/wireless/intel/iwlegacy | |
| parent | 733f0766c3dea0a92573e38acb62ace3cf4e58c6 (diff) | |
| parent | ddb754aa31813fd17d8374eba881827e6e2c85c6 (diff) | |
| download | linux-d96ec97511149b447712a5a401b290913cbd4426.tar.xz | |
Merge tag 'mac80211-next-for-davem-2019-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Many changes all over:
* HE (802.11ax) work continues
* WPA3 offloads
* work on extended key ID handling continues
* fixes to honour AP supported rates with auth/assoc frames
* nl80211 netlink policy improvements to fix some issues
with strict validation on new commands with old attrs
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/intel/iwlegacy/3945-rs.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlegacy/4965-rs.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-rs.c b/drivers/net/wireless/intel/iwlegacy/3945-rs.c index a697edd46e7f..922f09f7ea3e 100644 --- a/drivers/net/wireless/intel/iwlegacy/3945-rs.c +++ b/drivers/net/wireless/intel/iwlegacy/3945-rs.c @@ -646,9 +646,6 @@ il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, il_sta = NULL; } - if (rate_control_send_low(sta, il_sta, txrc)) - return; - rate_mask = sta->supp_rates[sband->band]; /* get user max rate if set */ diff --git a/drivers/net/wireless/intel/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c index 54ff83829afb..946f352fd9a4 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-rs.c @@ -2224,10 +2224,6 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, il_sta = NULL; } - /* Send management frames and NO_ACK data using lowest rate. */ - if (rate_control_send_low(sta, il_sta, txrc)) - return; - if (!lq_sta) return; |