projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[toolchain] enable UCLIBC_SUSV3_LEGACY in uClibc v0.9.30 configs to have <sys/timeb...
[openwrt.git]
/
package
/
mac80211
/
patches
/
405-ath9k-move-PCI-code-into-separate-file.patch
diff --git
a/package/mac80211/patches/405-ath9k-move-PCI-code-into-separate-file.patch
b/package/mac80211/patches/405-ath9k-move-PCI-code-into-separate-file.patch
index
0cdf4da
..
4a55ded
100644
(file)
--- a/
package/mac80211/patches/405-ath9k-move-PCI-code-into-separate-file.patch
+++ b/
package/mac80211/patches/405-ath9k-move-PCI-code-into-separate-file.patch
@@
-1,19
+1,22
@@
-From
d95e670cd1395ffd8410bed809b6d060f2183d6b
Mon Sep 17 00:00:00 2001
+From
4803193b165c67abcd7cb10dd0c178dbcffb6cc7
Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 5 Jan 2009 11:01:09 +0100
From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 5 Jan 2009 11:01:09 +0100
-Subject: [PATCH 05/11] ath9k: move PCI code into separate file
+Subject: [PATCH
v3
05/11] ath9k: move PCI code into separate file
Now that we have converted all bus specific routines to replaceable, we
can move the PCI specific codes into a separate file.
Now that we have converted all bus specific routines to replaceable, we
can move the PCI specific codes into a separate file.
+Changes-licensed-under: ISC
+
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
drivers/net/wireless/ath9k/Makefile | 1 +
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
drivers/net/wireless/ath9k/Makefile | 1 +
- drivers/net/wireless/ath9k/core.h | 1
8
++-
- drivers/net/wireless/ath9k/main.c |
299
+++--------------------------------
- drivers/net/wireless/ath9k/pci.c | 28
9
+++++++++++++++++++++++++++++++++
+ drivers/net/wireless/ath9k/core.h | 1
9
++-
+ drivers/net/wireless/ath9k/main.c |
300
+++--------------------------------
+ drivers/net/wireless/ath9k/pci.c | 28
7
+++++++++++++++++++++++++++++++++
4 files changed, 328 insertions(+), 279 deletions(-)
4 files changed, 328 insertions(+), 279 deletions(-)
+ create mode 100644 drivers/net/wireless/ath9k/pci.c
--- a/drivers/net/wireless/ath9k/Makefile
+++ b/drivers/net/wireless/ath9k/Makefile
--- a/drivers/net/wireless/ath9k/Makefile
+++ b/drivers/net/wireless/ath9k/Makefile
@@
-36,13
+39,14
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
#include <net/mac80211.h>
#include <linux/leds.h>
#include <linux/rfkill.h>
#include <net/mac80211.h>
#include <linux/leds.h>
#include <linux/rfkill.h>
-@@ -76
6,4 +766,20
@@ static inline void ath_bus_cleanup(struc
+@@ -76
7,4 +767,21
@@ static inline void ath_bus_cleanup(struc
sc->bus_ops->cleanup(sc);
}
+extern struct ieee80211_ops ath9k_ops;
+
+irqreturn_t ath_isr(int irq, void *dev);
sc->bus_ops->cleanup(sc);
}
+extern struct ieee80211_ops ath9k_ops;
+
+irqreturn_t ath_isr(int irq, void *dev);
++void ath_cleanup(struct ath_softc *sc);
+int ath_attach(u16 devid, struct ath_softc *sc);
+void ath_detach(struct ath_softc *sc);
+const char *ath_mac_bb_name(u32 mac_bb_version);
+int ath_attach(u16 devid, struct ath_softc *sc);
+void ath_detach(struct ath_softc *sc);
+const char *ath_mac_bb_name(u32 mac_bb_version);
@@
-59,7
+63,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
#endif /* CORE_H */
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
#endif /* CORE_H */
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
-@@ -28,3
8
+28,6 @@ MODULE_DESCRIPTION("Support for Atheros
+@@ -28,3
9
+28,6 @@ MODULE_DESCRIPTION("Support for Atheros
MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards");
MODULE_LICENSE("Dual BSD/GPL");
@@
-74,6
+78,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
-};
-
-static void ath_detach(struct ath_softc *sc);
-};
-
-static void ath_detach(struct ath_softc *sc);
+-static void ath_cleanup(struct ath_softc *sc);
-
-/* return bus cachesize in 4B word units */
-
-
-/* return bus cachesize in 4B word units */
-
@@
-98,7
+103,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
static void ath_cache_conf_rate(struct ath_softc *sc,
struct ieee80211_conf *conf)
{
static void ath_cache_conf_rate(struct ath_softc *sc,
struct ieee80211_conf *conf)
{
-@@ -
497,7 +465
,7 @@ static void ath9k_tasklet(unsigned long
+@@ -
500,7 +467
,7 @@ static void ath9k_tasklet(unsigned long
ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask);
}
ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask);
}
@@
-107,16
+112,25
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
{
struct ath_softc *sc = dev;
struct ath_hal *ah = sc->sc_ah;
{
struct ath_softc *sc = dev;
struct ath_hal *ah = sc->sc_ah;
-@@ -12
78,7 +1246
,7 @@ static int ath_start_rfkill_poll(struct
+@@ -12
81,7 +1248
,7 @@ static int ath_start_rfkill_poll(struct
}
#endif /* CONFIG_RFKILL */
}
#endif /* CONFIG_RFKILL */
+-static void ath_cleanup(struct ath_softc *sc)
++void ath_cleanup(struct ath_softc *sc)
+ {
+ ath_detach(sc);
+ free_irq(sc->irq, sc);
+@@ -1289,7 +1256,7 @@ static void ath_cleanup(struct ath_softc
+ ieee80211_free_hw(sc->hw);
+ }
+
-static void ath_detach(struct ath_softc *sc)
+void ath_detach(struct ath_softc *sc)
{
struct ieee80211_hw *hw = sc->hw;
int i = 0;
-static void ath_detach(struct ath_softc *sc)
+void ath_detach(struct ath_softc *sc)
{
struct ieee80211_hw *hw = sc->hw;
int i = 0;
-@@ -15
29,7 +1497
,7 @@ bad:
+@@ -15
43,7 +1510
,7 @@ bad:
return error;
}
return error;
}
@@
-125,7
+139,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
{
struct ieee80211_hw *hw = sc->hw;
int error = 0;
{
struct ieee80211_hw *hw = sc->hw;
int error = 0;
-@@ -24
48,7 +2416
,7 @@ static int ath9k_ampdu_action(struct iee
+@@ -24
66,7 +2433
,7 @@ static int ath9k_ampdu_action(struct iee
return ret;
}
return ret;
}
@@
-134,7
+148,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
.tx = ath9k_tx,
.start = ath9k_start,
.stop = ath9k_stop,
.tx = ath9k_tx,
.start = ath9k_start,
.stop = ath9k_stop,
-@@ -2
492,7 +2460
,7 @@ static struct {
+@@ -2
510,7 +2477
,7 @@ static struct {
/*
* Return the MAC/BB name. "????" is returned if the MAC/BB is unknown.
*/
/*
* Return the MAC/BB name. "????" is returned if the MAC/BB is unknown.
*/
@@
-143,7
+157,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
ath_mac_bb_name(u32 mac_bb_version)
{
int i;
ath_mac_bb_name(u32 mac_bb_version)
{
int i;
-@@ -25
09,7 +2477
,7 @@ ath_mac_bb_name(u32 mac_bb_version)
+@@ -25
27,7 +2494
,7 @@ ath_mac_bb_name(u32 mac_bb_version)
/*
* Return the RF name. "????" is returned if the RF is unknown.
*/
/*
* Return the RF name. "????" is returned if the RF is unknown.
*/
@@
-152,7
+166,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
ath_rf_name(u16 rf_version)
{
int i;
ath_rf_name(u16 rf_version)
{
int i;
-@@ -25
23,236 +2491
,7 @@ ath_rf_name(u16 rf_version)
+@@ -25
41,234 +2508
,7 @@ ath_rf_name(u16 rf_version)
return "????";
}
return "????";
}
@@
-160,13
+174,9
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
-{
- struct pci_dev *pdev = to_pci_dev(sc->dev);
-
-{
- struct pci_dev *pdev = to_pci_dev(sc->dev);
-
-- ath_detach(sc);
-- if (pdev->irq)
-- free_irq(pdev->irq, sc);
- pci_iounmap(pdev, sc->mem);
- pci_release_region(pdev, 0);
- pci_disable_device(pdev);
- pci_iounmap(pdev, sc->mem);
- pci_release_region(pdev, 0);
- pci_disable_device(pdev);
-- ieee80211_free_hw(sc->hw);
-}
-
-static struct ath_bus_ops ath_pci_bus_ops = {
-}
-
-static struct ath_bus_ops ath_pci_bus_ops = {
@@
-278,6
+288,8
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
- goto bad4;
- }
-
- goto bad4;
- }
-
+- sc->irq = pdev->irq;
+-
- ah = sc->sc_ah;
- printk(KERN_INFO
- "%s: Atheros AR%s MAC/BB Rev:%x "
- ah = sc->sc_ah;
- printk(KERN_INFO
- "%s: Atheros AR%s MAC/BB Rev:%x "
@@
-308,7
+320,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
- struct ieee80211_hw *hw = pci_get_drvdata(pdev);
- struct ath_softc *sc = hw->priv;
-
- struct ieee80211_hw *hw = pci_get_drvdata(pdev);
- struct ath_softc *sc = hw->priv;
-
-- ath_
pci_
cleanup(sc);
+- ath_cleanup(sc);
-}
-
-#ifdef CONFIG_PM
-}
-
-#ifdef CONFIG_PM
@@
-390,7
+402,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
{
int error;
{
int error;
-@@ -27
64,26 +2503
,30 @@ static int __init init_ath_pci(void)
+@@ -27
80,26 +2520
,30 @@ static int __init init_ath_pci(void)
printk(KERN_ERR
"Unable to register rate control algorithm: %d\n",
error);
printk(KERN_ERR
"Unable to register rate control algorithm: %d\n",
error);
@@
-433,7
+445,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+module_exit(ath9k_exit);
--- /dev/null
+++ b/drivers/net/wireless/ath9k/pci.c
+module_exit(ath9k_exit);
--- /dev/null
+++ b/drivers/net/wireless/ath9k/pci.c
-@@ -0,0 +1,28
9
@@
+@@ -0,0 +1,28
7
@@
+/*
+ * Copyright (c) 2008 Atheros Communications Inc.
+ *
+/*
+ * Copyright (c) 2008 Atheros Communications Inc.
+ *
@@
-489,13
+501,9
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+{
+ struct pci_dev *pdev = to_pci_dev(sc->dev);
+
+{
+ struct pci_dev *pdev = to_pci_dev(sc->dev);
+
-+ ath_detach(sc);
-+ if (pdev->irq)
-+ free_irq(pdev->irq, sc);
+ pci_iounmap(pdev, sc->mem);
+ pci_release_region(pdev, 0);
+ pci_disable_device(pdev);
+ pci_iounmap(pdev, sc->mem);
+ pci_release_region(pdev, 0);
+ pci_disable_device(pdev);
-+ ieee80211_free_hw(sc->hw);
+}
+
+static struct ath_bus_ops ath_pci_bus_ops = {
+}
+
+static struct ath_bus_ops ath_pci_bus_ops = {
@@
-607,6
+615,8
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+ goto bad4;
+ }
+
+ goto bad4;
+ }
+
++ sc->irq = pdev->irq;
++
+ ah = sc->sc_ah;
+ printk(KERN_INFO
+ "%s: Atheros AR%s MAC/BB Rev:%x "
+ ah = sc->sc_ah;
+ printk(KERN_INFO
+ "%s: Atheros AR%s MAC/BB Rev:%x "
@@
-637,7
+647,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+ struct ath_softc *sc = hw->priv;
+
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+ struct ath_softc *sc = hw->priv;
+
-+ ath_
pci_
cleanup(sc);
++ ath_cleanup(sc);
+}
+
+#ifdef CONFIG_PM
+}
+
+#ifdef CONFIG_PM
This page took
0.028532 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff