linux/drivers/net/wireless
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
..
admtek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
atmel cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
broadcom brcm80211: correct speed testing 2016-05-03 15:49:34 -04:00
cisco treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
intel iwlwifi: fix mis-merge that breaks the driver 2016-05-18 12:11:22 -07:00
intersil treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
marvell treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
mediatek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ralink rt2800lib: enable MFP if hw crypt is disabled 2016-04-26 12:30:43 +03:00
realtek Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2016-05-17 17:05:30 -07:00
rsi cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
st cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ti cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
zydas treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
Kconfig
mac80211_hwsim.c drivers/wireless: use nla_put_u64_64bit() 2016-04-26 12:00:48 -04:00
mac80211_hwsim.h drivers/wireless: use nla_put_u64_64bit() 2016-04-26 12:00:48 -04:00
Makefile
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
wl3501_cs.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
wl3501.h