pull request: wireless 2012-02-15

pull request: wireless 2012-02-15

[John W. Linville]

[-- Attachment #1: Type: text/plain, Size: 2591 bytes --]

commit 33b5d30cd8b200024d55ac5830c9efde1102ef4c

Dave,

Here are two more fixes intended for 3.3.  One changes the non-error
return code for a routine in rtlwifi -- it had been masking an error
condition that could lead to a divide by zero.  The other moves a
routine inside of a locked critical section to avoid a "BUG: rwlock bad
magic".

Please let me know if there are problems!

Thanks,

John

---

The following changes since commit 3013dc0cceb9baaf25d5624034eeaa259bf99004:

  3c59x: shorten timer period for slave devices (2012-02-14 16:28:23 -0500)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem

John W. Linville (1):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem

Mohammed Shafi Shajakhan (1):
      mac80211: Fix a rwlock bad magic bug

Simon Graham (1):
      rtlwifi: Modify rtl_pci_init to return 0 on success

 drivers/net/wireless/rtlwifi/pci.c |    4 ++--
 net/mac80211/main.c                |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 39e0907..9245d88 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1501,7 +1501,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
 		return err;
 	}
 
-	return 1;
+	return 0;
 }
 
 static int rtl_pci_start(struct ieee80211_hw *hw)
@@ -1870,7 +1870,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 	}
 
 	/* Init PCI sw */
-	err = !rtl_pci_init(hw, pdev);
+	err = rtl_pci_init(hw, pdev);
 	if (err) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 			 ("Failed to init PCI.\n"));
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0a0d94a..b142bd4 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -910,6 +910,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
 			    result);
 
+	ieee80211_led_init(local);
+
 	rtnl_lock();
 
 	result = ieee80211_init_rate_ctrl_alg(local,
@@ -931,8 +933,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
 	rtnl_unlock();
 
-	ieee80211_led_init(local);
-
 	local->network_latency_notifier.notifier_call =
 		ieee80211_max_network_latency;
 	result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: pull request: wireless 2012-02-15

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 15 Feb 2012 14:21:06 -0500

> Here are two more fixes intended for 3.3.  One changes the non-error
> return code for a routine in rtlwifi -- it had been masking an error
> condition that could lead to a divide by zero.  The other moves a
> routine inside of a locked critical section to avoid a "BUG: rwlock bad
> magic".
> 
> Please let me know if there are problems!

Pulled.