diff options
Diffstat (limited to 'package/kernel/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index d6d042d..1405cc3 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -1,3 +1,18 @@ +commit 8c7ae357cc5b6bd037ad2d666e9f3789cf882925 +Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> +Date: Wed Apr 23 15:07:57 2014 +0530 + + ath9k: fix race in setting ATH_OP_INVALID + + The commit "ath9k: move sc_flags to ath_common" moved setting + ATH_OP_INVALID flag below ieee80211_register_hw. This is causing + the flag never being cleared randomly as the drv_start is called + prior to setting flag. Fix this by setting the flag prior to + register_hw. + + Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> + Signed-off-by: John W. Linville <linville@tuxdriver.com> + commit c82552c5b0cb1735dbcbad78b1ffc6d3c212dc56 Author: Tim Harvey <tharvey@gateworks.com> Date: Mon Apr 21 16:14:57 2014 -0700 @@ -308,3 +323,56 @@ Date: Sun Apr 6 23:35:28 2014 +0200 } while (1); if (!(ah->imask & ATH9K_INT_RXEOL)) { +--- a/drivers/net/wireless/ath/ath9k/ahb.c ++++ b/drivers/net/wireless/ath/ath9k/ahb.c +@@ -86,7 +86,6 @@ static int ath_ahb_probe(struct platform + int irq; + int ret = 0; + struct ath_hw *ah; +- struct ath_common *common; + char hw_name[64]; + + if (!dev_get_platdata(&pdev->dev)) { +@@ -146,9 +145,6 @@ static int ath_ahb_probe(struct platform + wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", + hw_name, (unsigned long)mem, irq); + +- common = ath9k_hw_common(sc->sc_ah); +- /* Will be cleared in ath9k_start() */ +- set_bit(ATH_OP_INVALID, &common->op_flags); + return 0; + + err_irq: +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -781,6 +781,9 @@ int ath9k_init_device(u16 devid, struct + common = ath9k_hw_common(ah); + ath9k_set_hw_capab(sc, hw); + ++ /* Will be cleared in ath9k_start() */ ++ set_bit(ATH_OP_INVALID, &common->op_flags); ++ + /* Initialize regulatory */ + error = ath_regd_init(&common->regulatory, sc->hw->wiphy, + ath9k_reg_notifier); +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -784,7 +784,6 @@ static int ath_pci_probe(struct pci_dev + { + struct ath_softc *sc; + struct ieee80211_hw *hw; +- struct ath_common *common; + u8 csz; + u32 val; + int ret = 0; +@@ -877,10 +876,6 @@ static int ath_pci_probe(struct pci_dev + wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", + hw_name, (unsigned long)sc->mem, pdev->irq); + +- /* Will be cleared in ath9k_start() */ +- common = ath9k_hw_common(sc->sc_ah); +- set_bit(ATH_OP_INVALID, &common->op_flags); +- + return 0; + + err_init: |