diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-28 17:42:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-28 17:42:36 -0400 |
| commit | d2aa8eec7f83f1b18f492e1e9aa634a001c2f58c (patch) | |
| tree | ddadafda9ba834e74e7f882d761900e08bb1ca1c /drivers/net/wireless/iwlwifi/dvm/ucode.c | |
| parent | 91c5746425aed8f7188a351f1224a26aa232e4b3 (diff) | |
| parent | 630a216da662ba4197e330118fc55d772a2d7ec9 (diff) | |
Merge branch 'wireless'
John W. Linville says:
====================
Please excuse this larger-than-I-would-like pull request intended
for the 3.9 stream. There are a number of late-breaking fixes,
including a revert...
Regarding the mac80211 bits, Johannes says:
"I have two tracing fixes (one from Vladimir), two fixes for P2P device
crashes, a fix for a BSS memory leak/lost update problem and a fix from
Ben for a scanning issue in mac80211. It's a little on the large side
because one of the P2P device problems required a bit much locking work,
but I've run through all the different scenarios (wext/nl80211,
p2p-device/station interface, ifdown/rfkill) to verify locking with
lockdep."
As for the iwlwifi bits, Johannes says:
"I have three little fixes to the driver from Emmanuel. One addresses a
small bug Ben Hutchings found during the stable review process and two
address some warnings in the driver when RF-Kill is asserted."
Along with those...
Avinash Patil fixes an mwifiex bug cause by failing to process a sleep
command due to bad SKB manipulation when going into power saving mode.
Colin Ian King avoids a null pointer dereference in iwl4965.
Dan Williams officially announces that he has dropped maintainership
of the libertas driver.
Iestyn C. Elfick adds a work-around to avoid b43 DMA transmision
sequence error that would lead to a device reset.
Luis R. Rodriguez avoids an ath9k warning by not queueing a work item
while going to suspend mode.
Rafał Miłecki provides a pair of b43 N-PHY fixes related to RSSI
calibration.
Finally, I revert "brcmsmac: support 4313iPA" because it has been
reported in many places to cause problems with the already supported
4313ePA devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/ucode.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/ucode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c index 736fe9bb140..1a4ac9236a4 100644 --- a/drivers/net/wireless/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c @@ -367,6 +367,8 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, return -EIO; } + priv->ucode_loaded = true; + if (ucode_type != IWL_UCODE_WOWLAN) { /* delay a bit to give rfkill time to run */ msleep(5); @@ -380,8 +382,6 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, return ret; } - priv->ucode_loaded = true; - return 0; } |