diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-15 01:16:40 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-15 01:16:40 +0000 |
| commit | 8f8c254d1f6b42d1a6f67b26e29fd4f2dcb91c61 (patch) | |
| tree | b87c43a312e236e4de933bf52b058894fd3c0927 /package/mac80211/patches/300-ath9k_fix_init_crash.patch | |
| parent | 23e340324090a30fa3fa50aa2301a9ec6e78bd1f (diff) | |
mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19139 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-ath9k_fix_init_crash.patch')
| -rw-r--r-- | package/mac80211/patches/300-ath9k_fix_init_crash.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-ath9k_fix_init_crash.patch b/package/mac80211/patches/300-ath9k_fix_init_crash.patch new file mode 100644 index 000000000..8f3540b5d --- /dev/null +++ b/package/mac80211/patches/300-ath9k_fix_init_crash.patch @@ -0,0 +1,35 @@ +--- a/drivers/net/wireless/ath/ath9k/ahb.c ++++ b/drivers/net/wireless/ath/ath9k/ahb.c +@@ -121,6 +121,9 @@ static int ath_ahb_probe(struct platform + sc->mem = mem; + sc->irq = irq; + ++ /* Will be cleared in ath9k_start() */ ++ sc->sc_flags |= SC_OP_INVALID; ++ + ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc); + if (ret) { + dev_err(&pdev->dev, "request_irq failed\n"); +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -534,8 +534,6 @@ static int ath9k_init_softc(u16 devid, s + int ret = 0, i; + int csz = 0; + +- sc->sc_flags |= SC_OP_INVALID; +- + ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL); + if (!ah) + return -ENOMEM; +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -202,6 +202,9 @@ static int ath_pci_probe(struct pci_dev + sc->dev = &pdev->dev; + sc->mem = mem; + ++ /* Will be cleared in ath9k_start() */ ++ sc->sc_flags |= SC_OP_INVALID; ++ + ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc); + if (ret) { + dev_err(&pdev->dev, "request_irq failed\n"); |