linux/drivers/net/wireless/intel/iwlwifi
Linus Torvalds 0e034f5c4b iwlwifi: fix mis-merge that breaks the driver
My laptop that uses the intel 7680 iwlwifi module would no longer
connects to the network.  It would fail with a "Microcode SW error
detected." and spew out register state over and over again without ever
connecting to the network.

The cause is mis-merge in commit 909b27f706, where David seems to have
lost some of the changes to iwl_mvm_set_tx_cmd() from commit
5c08b0f502 ("iwlwifi: mvm: don't override the rate with the AMSDU
len").

The reason seems to be a conflict with commit d8fe484470 ("iwlwifi:
mvm: add support for new TX CMD API"), which touched a line adjacent to
the changes in 909b27f706.

David missed the fact that "info->driver_data[0]" had become
"skb_info->driver_data[0]".  Then he removed the skb_info because it was
unused.

This just re-updates iwl_mvm_set_tx_cmd() with the lost two lines.

Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: Reinoud Koornstra <reinoudkoornstra@gmail.com>
Cc: Luciano Coelho <luciano.coelho@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-05-18 12:11:22 -07:00
..
dvm cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
mvm iwlwifi: fix mis-merge that breaks the driver 2016-05-18 12:11:22 -07:00
pcie Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
iwl-1000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-2000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-5000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-6000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-7000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-8000.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
iwl-9000.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-agn-hw.h
iwl-config.h cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-csr.h iwlwifi: add support for getting HW address from CSR 2016-03-09 20:59:19 +02:00
iwl-debug.c
iwl-debug.h
iwl-devtrace-data.h iwlwifi: pcie: build an A-MSDU using TSO core 2015-12-20 23:27:37 +02:00
iwl-devtrace-io.h
iwl-devtrace-iwlwifi.h iwlwifi: mvm: adapt the firmware assert log to new firmware 2016-03-09 21:05:16 +02:00
iwl-devtrace-msg.h
iwl-devtrace-ucode.h
iwl-devtrace.c
iwl-devtrace.h
iwl-drv.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
iwl-drv.h
iwl-eeprom-parse.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-eeprom-parse.h cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-eeprom-read.c
iwl-eeprom-read.h
iwl-fh.h iwlwifi: pcie: fine tune number of rxbs 2016-03-09 20:59:19 +02:00
iwl-fw-error-dump.h iwlwifi: mvm: support dumping UMAC internal txfifos 2016-03-20 13:26:02 +02:00
iwl-fw-file.h iwlwifi: fix fw version reading for DVM devices 2016-04-26 12:32:07 +03:00
iwl-fw.h iwlwifi: store fw memory segments length and addresses in run-time 2016-03-30 16:24:50 +03:00
iwl-io.c iwlwifi: remove unused parameter from grab_nic_access 2015-12-21 10:11:39 +02:00
iwl-io.h
iwl-modparams.h iwlwifi: make uapsd_disable module param a bitmap 2016-03-30 16:21:23 +03:00
iwl-notif-wait.c
iwl-notif-wait.h
iwl-nvm-parse.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
iwl-nvm-parse.h iwlwifi: refactor the code that reads the MAC address from the NVM 2016-03-07 13:33:00 +02:00
iwl-op-mode.h
iwl-phy-db.c
iwl-phy-db.h
iwl-prph.h iwlwifi: mvm: support dumping UMAC internal txfifos 2016-03-20 13:26:02 +02:00
iwl-scd.h
iwl-trans.c
iwl-trans.h iwlwifi: trans: fix iwl_trans_txq_scd_cfg.sta_id sign 2016-03-30 16:21:29 +03:00
Kconfig iwlwifi: remove IWLWIFI_UAPSD Kconfig 2016-03-30 16:21:26 +03:00
Makefile