From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 Sep 2009 23:23:46 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=139d6065c83071d5f66cd013a274a43699f8e2c1;p=linux-beck.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-rx.c
---

139d6065c83071d5f66cd013a274a43699f8e2c1
diff --cc drivers/net/wireless/b43/main.c
index e789792a36bc,6c0ea214a82e..9b907a36bb8c
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -4280,15 -4364,11 +4364,13 @@@ static int b43_wireless_core_init(struc
  	ssb_bus_powerup(bus, !(sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW));
  	b43_upload_card_macaddress(dev);
  	b43_security_init(dev);
- 	if (!dev->suspend_in_progress)
- 		b43_rng_init(wl);
+ 
+ 	ieee80211_wake_queues(dev->wl->hw);
  
 +	ieee80211_wake_queues(dev->wl->hw);
 +
  	b43_set_status(dev, B43_STAT_INITIALIZED);
  
- 	if (!dev->suspend_in_progress)
- 		b43_leds_init(dev);
  out:
  	return err;