UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Last set of iwlwifi patches for 4.14 

* Fix a queue hang problem due to 11w behavior
 * Fix a warning caused by a too long debug print
 * Bump API number to the latest version we support
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEF3LNfgb2BPWm68smoUecoho8xfoFAlmmhhoACgkQoUecoho8
 xfogVg/9ExYtThVvcWGhunbWXCPr3Pg6NV0MOBEsoGlbpsJiut6rc4pq4dgqmFq6
 iKJp4EDaXEqcwFA6Hktj8HOLRrmX9DjWM3N5cAChOBaAkJfaLz7HszPm8zoWO6QD
 h8zMwLceRMKHF2qIh1dS8vwc9KND1B+vsa/GggKcf9rQzzYpPnJgQHYDFWwoSgY2
 TMBRJD4iXsn2XWsImlfb2g/Ku7djN/KO5DE5xoEkB/rVlbXHlT1ZKYFIoQlZJWel
 +AoQrnqhbvwMrmUSIPD185fwOjiILZrylZJJxxi1fU6Yxp9L6ud9j5HXDRLN0oIM
 zUV6U0wkD41JUGltMK89JvHZCcbMKGf0SJ+kw5qeWtN9ZR4EOLOggmC9sN0MTCXe
 gBNEDHb80/8xLrkYg3RBqnpJBPaOLZQfyWcP89YnWskdCwi7vaklys15TCqrUJCl
 NwRqKingOO8Js7Pn7uglfXGkycJWIIxZ54L59sQSa+9PC5xvCOX2NxPOtgkVLUaR
 gJJel9c4WyBgSneWvxSsqYpDmkO299IaAgjtFTFXibbM75oQfE0uVqojirbRi6p6
 TUjm9p6bsFlTUSPFyi03pyDwaNpN2m+w752LYRdn0A0yFnJtoBps/V3oYf9dbh+l
 Dm2qRLK+ivY+lPQTFTLu2wQ8l51EiVlNqJ7wD1WwVQE9C+cMQKw=
 =byLy
 -----END PGP SIGNATURE-----

Merge tag 'iwlwifi-next-for-kalle-2017-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Last set of iwlwifi patches for 4.14

* Fix a queue hang problem due to 11w behavior
* Fix a warning caused by a too long debug print
* Bump API number to the latest version we support
This commit is contained in:
Kalle Valo 2017-08-30 19:17:44 +03:00
parent d081a16db8 d7a5b3e9e4
commit 51052dd21a
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/intel/iwlwifi/cfg/8000.c
View File

@ -70,8 +70,8 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
#define IWL8000_UCODE_API_MAX 33
#define IWL8265_UCODE_API_MAX 33
#define IWL8000_UCODE_API_MAX 34
#define IWL8265_UCODE_API_MAX 34
/* Lowest firmware API version supported */
#define IWL8000_UCODE_API_MIN 22

2
drivers/net/wireless/intel/iwlwifi/cfg/9000.c
View File

@ -55,7 +55,7 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
#define IWL9000_UCODE_API_MAX 33
#define IWL9000_UCODE_API_MAX 34
/* Lowest firmware API version supported */
#define IWL9000_UCODE_API_MIN 30

2
drivers/net/wireless/intel/iwlwifi/cfg/a000.c
View File

@ -55,7 +55,7 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
#define IWL_A000_UCODE_API_MAX 33
#define IWL_A000_UCODE_API_MAX 34
/* Lowest firmware API version supported */
#define IWL_A000_UCODE_API_MIN 24

9
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
View File

@ -915,7 +915,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
prev_reg_rule_flags = reg_rule_flags;
IWL_DEBUG_DEV(dev, IWL_DL_LAR,
"Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
"Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x)\n",
center_freq,
band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
CHECK_AND_PRINT_I(VALID),
@ -930,7 +930,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
CHECK_AND_PRINT_I(80MHZ),
CHECK_AND_PRINT_I(160MHZ),
CHECK_AND_PRINT_I(DC_HIGH),
ch_flags, reg_rule_flags,
ch_flags);
IWL_DEBUG_DEV(dev, IWL_DL_LAR,
"Ch. %d [%sGHz] reg_flags 0x%x: %s\n",
center_freq,
band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
reg_rule_flags,
((ch_flags & NVM_CHANNEL_ACTIVE) &&
!(ch_flags & NVM_CHANNEL_RADAR))
? "Ad-Hoc" : "");

9
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@ -810,10 +810,11 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
!test_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status))
goto drop;
/* treat non-bufferable MMPDUs as broadcast if sta is sleeping */
if (unlikely(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER &&
ieee80211_is_mgmt(hdr->frame_control) &&
!ieee80211_is_bufferable_mmpdu(hdr->frame_control)))
/* treat non-bufferable MMPDUs on AP interfaces as broadcast */
if ((info->control.vif->type == NL80211_IFTYPE_AP ||
info->control.vif->type == NL80211_IFTYPE_ADHOC) &&
ieee80211_is_mgmt(hdr->frame_control) &&
!ieee80211_is_bufferable_mmpdu(hdr->frame_control))
sta = NULL;
if (sta) {