Re: pull-request: iwlwifi-next 2017-08-18
Hi Kalle, On Wed, 23 Aug 2017 18:21:51 +0300 Kalle Valowrote: > > Luca Coelho writes: > > > Here's my third pull-request intended for v4.14. We continued doing > > generic development work, with improvements, bug fixes and cleanups all > > around. More details in the tag description. > > > > My patch "iwlwifi: update channel flags parser" is going to cause a > > conflict with net because they both change the same string in debug > > message. Emmanuel's patch "iwlwifi: split the regulatory rules when the > > bandwidth flags require it" added "reg_flags" to the string and changed > > the Ad-hoc string. My patch added a few %s's and also changed the Ad- > > hoc string. The result of the conflict resolution should look like > > this: > > > > "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" > > Thanks, I'll Cc Stephen because he most probably sees that conflict > tomorrow. Thanks for the heads up ... -- Cheers, Stephen Rothwell
Re: pull-request: iwlwifi-next 2017-08-18
Luca Coelhowrites: > Here's my third pull-request intended for v4.14. We continued doing > generic development work, with improvements, bug fixes and cleanups all > around. More details in the tag description. > > My patch "iwlwifi: update channel flags parser" is going to cause a > conflict with net because they both change the same string in debug > message. Emmanuel's patch "iwlwifi: split the regulatory rules when the > bandwidth flags require it" added "reg_flags" to the string and changed > the Ad-hoc string. My patch added a few %s's and also changed the Ad- > hoc string. The result of the conflict resolution should look like > this: > > "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" Thanks, I'll Cc Stephen because he most probably sees that conflict tomorrow. > I have sent this out before, and kbuildbot reported success. > > Please let me know if there are any issues. > > Cheers, > Luca. > > > The following changes since commit 38ef62353acbaa0eea062a9f047b33aebd7d52ce: > > rsi: security enhancements for AP mode (2017-08-17 10:07:00 +0300) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git > tags/iwlwifi-next-for-kalle-2017-08-18 > > for you to fetch changes up to 8fe34b060a4b11be35ffd9383acdd0bc7bee72e2: > > iwlwifi: use big-endian for the hw section of the nvm (2017-08-18 17:36:42 > +0300) > > > Third set of iwlwifi patches for 4.14 > > * Work for the upcoming A000 device family continues; > * Improvements in debugging; > * A couple of improvements in block-ack sessions; > * Some fixes for channel switch; > * A workaround for a HW data bug; > * Some FW API updates; > * General fixes and cleanups here and there. > > Pulled, thanks. -- Kalle Valo
pull-request: iwlwifi-next 2017-08-18
Hi Kalle, Here's my third pull-request intended for v4.14. We continued doing generic development work, with improvements, bug fixes and cleanups all around. More details in the tag description. My patch "iwlwifi: update channel flags parser" is going to cause a conflict with net because they both change the same string in debug message. Emmanuel's patch "iwlwifi: split the regulatory rules when the bandwidth flags require it" added "reg_flags" to the string and changed the Ad-hoc string. My patch added a few %s's and also changed the Ad- hoc string. The result of the conflict resolution should look like this: "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" I have sent this out before, and kbuildbot reported success. Please let me know if there are any issues. Cheers, Luca. The following changes since commit 38ef62353acbaa0eea062a9f047b33aebd7d52ce: rsi: security enhancements for AP mode (2017-08-17 10:07:00 +0300) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-08-18 for you to fetch changes up to 8fe34b060a4b11be35ffd9383acdd0bc7bee72e2: iwlwifi: use big-endian for the hw section of the nvm (2017-08-18 17:36:42 +0300) Third set of iwlwifi patches for 4.14 * Work for the upcoming A000 device family continues; * Improvements in debugging; * A couple of improvements in block-ack sessions; * Some fixes for channel switch; * A workaround for a HW data bug; * Some FW API updates; * General fixes and cleanups here and there. Avraham Stern (1): iwlwifi: mvm: remove session protection to allow channel switch Emmanuel Grumbach (7): iwlwifi: mvm: remove the corunning support iwlwifi: mvm: support new Coex firmware API iwlwifi: pcie: support short Tx queues for A000 device family iwlwifi: mvm: add command name for FRAME_RELEASE iwlwifi: mvm: include more debug data when we get an unexpected baid iwlwifi: mvm: update the firmware API in TX iwlwifi: mvm: don't send BAR on flushed frames Gregory Greenman (1): iwlwifi: mvm: change open and close criteria of a BA session Ilan Peer (1): iwlwifi: mvm: Fix channel switch in case of count <= 1 João Paulo Rechi Vita (1): iwlwifi: Demote messages about fw flags size to info Luca Coelho (12): iwlwifi: mvm: consider RFKILL during INIT as success iwlwifi: call iwl_remove_notification from iwl_wait_notification iwlwifi: mvm: group all dummy SAR function declarations together iwlwifi: mvm: use mvmsta consistently in rs.c iwlwifi: move BT_MBOX_PRINT macro to common header iwlwifi: pci: add new PCI ID for 7265D iwlwifi: update channel flags parser iwlwifi: add workaround to disable wide channels in 5GHz iwlwifi: fw: fix lar_enabled endian problem in iwl_fw_get_nvm iwlwifi: mvm: remove useless argument in iwl_nvm_init() iwlwifi: mvm: remove useless check for mvm->cfg in iwl_parse_nvm_section() iwlwifi: use big-endian for the hw section of the nvm Tzipi Peres (1): iwlwifi: distinguish different RF modules in A000 devices drivers/net/wireless/intel/iwlwifi/cfg/a000.c| 34 ++- drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 50 +++- drivers/net/wireless/intel/iwlwifi/fw/api/commands.h | 12 drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 8 --- drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 9 +-- drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c | 25 drivers/net/wireless/intel/iwlwifi/fw/nvm.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 4 +- drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 7 ++- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 12 ++-- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 118 +++--- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/coex.c| 301 + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 30 -- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 54 ++ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c| 16 -- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 31 +++--- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 106 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 143 +-