You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		9 years ago
..
admtek	cfg80211: remove enum ieee80211_band	9 years ago
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	9 years ago
atmel	cfg80211: remove enum ieee80211_band	9 years ago
broadcom	brcm80211: correct speed testing	9 years ago
cisco	treewide: replace dev->trans_start update with helper	9 years ago
intel	iwlwifi: fix mis-merge that breaks the driver	9 years ago
intersil	treewide: replace dev->trans_start update with helper	9 years ago
marvell	treewide: replace dev->trans_start update with helper	9 years ago
mediatek	cfg80211: remove enum ieee80211_band	9 years ago
ralink	rt2800lib: enable MFP if hw crypt is disabled	9 years ago
realtek	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	9 years ago
rsi	cfg80211: remove enum ieee80211_band	9 years ago
st	cfg80211: remove enum ieee80211_band	9 years ago
ti	cfg80211: remove enum ieee80211_band	9 years ago
zydas	treewide: replace dev->trans_start update with helper	9 years ago
Kconfig	mac80211_hwsim: move Kconfig entry for sorting alphabetically	9 years ago
Makefile	ath: unify Kconfig with other vendors	9 years ago
mac80211_hwsim.c	drivers/wireless: use nla_put_u64_64bit()	9 years ago
mac80211_hwsim.h	drivers/wireless: use nla_put_u64_64bit()	9 years ago
ray_cs.c	…
ray_cs.h	…
rayctl.h	…
rndis_wlan.c	cfg80211: remove enum ieee80211_band	9 years ago
wl3501.h	…
wl3501_cs.c	treewide: replace dev->trans_start update with helper	9 years ago