diff options
author | Christian Lamparter <chunkeey@web.de> | 2009-03-24 11:21:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:13:19 -0400 |
commit | de00c04ecbb482507ace2197782123446a1cfdca (patch) | |
tree | c95c6de54bac02ecdb75303f920790edd8d6d289 | |
parent | 051b919188650fe4c93ca8701183ae88439388f6 (diff) |
ar9170: single module build
This patch restores all-in-one module build procedure for ar9170.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/Kconfig | 17 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/cmd.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/main.c | 40 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/usb.c | 3 |
6 files changed, 7 insertions, 60 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 5e7c9acb6bec..50e7fba7f0ea 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
@@ -57,6 +57,6 @@ obj-$(CONFIG_P54_COMMON) += p54/ | |||
57 | 57 | ||
58 | obj-$(CONFIG_ATH5K) += ath5k/ | 58 | obj-$(CONFIG_ATH5K) += ath5k/ |
59 | obj-$(CONFIG_ATH9K) += ath9k/ | 59 | obj-$(CONFIG_ATH9K) += ath9k/ |
60 | obj-$(CONFIG_AR9170_COMMON) += ar9170/ | 60 | obj-$(CONFIG_AR9170_USB) += ar9170/ |
61 | 61 | ||
62 | obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o | 62 | obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o |
diff --git a/drivers/net/wireless/ar9170/Kconfig b/drivers/net/wireless/ar9170/Kconfig index f6611876e285..de4281fda129 100644 --- a/drivers/net/wireless/ar9170/Kconfig +++ b/drivers/net/wireless/ar9170/Kconfig | |||
@@ -1,17 +1,6 @@ | |||
1 | config AR9170_COMMON | ||
2 | tristate "Atheros AR9170 support" | ||
3 | depends on WLAN_80211 && MAC80211 && EXPERIMENTAL | ||
4 | help | ||
5 | This is common code for AR9170 based devices. | ||
6 | This module does nothing by itself - the USB/(SPI) frontends | ||
7 | also need to be enabled in order to support any devices. | ||
8 | |||
9 | Say Y if you have the hardware, or M to build a module called | ||
10 | ar9170common. | ||
11 | |||
12 | config AR9170_USB | 1 | config AR9170_USB |
13 | tristate "Atheros AR9170 USB support" | 2 | tristate "Atheros AR9170 802.11n USB support" |
14 | depends on AR9170_COMMON && USB | 3 | depends on USB && MAC80211 && WLAN_80211 && EXPERIMENTAL |
15 | select FW_LOADER | 4 | select FW_LOADER |
16 | help | 5 | help |
17 | This is a driver for the Atheros "otus" 802.11n USB devices. | 6 | This is a driver for the Atheros "otus" 802.11n USB devices. |
@@ -24,5 +13,5 @@ config AR9170_USB | |||
24 | 13 | ||
25 | config AR9170_LEDS | 14 | config AR9170_LEDS |
26 | bool | 15 | bool |
27 | depends on AR9170_COMMON && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = AR9170_COMMON) | 16 | depends on AR9170_USB && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = AR9170_USB) |
28 | default y | 17 | default y |
diff --git a/drivers/net/wireless/ar9170/Makefile b/drivers/net/wireless/ar9170/Makefile index 59b174dd466a..8d91c7ee3215 100644 --- a/drivers/net/wireless/ar9170/Makefile +++ b/drivers/net/wireless/ar9170/Makefile | |||
@@ -1,5 +1,3 @@ | |||
1 | ar9170common-objs += main.o cmd.o mac.o phy.o led.o | 1 | ar9170usb-objs := usb.o main.o cmd.o mac.o phy.o led.o |
2 | ar9170usb-objs += usb.o | ||
3 | 2 | ||
4 | obj-$(CONFIG_AR9170_COMMON) += ar9170common.o | ||
5 | obj-$(CONFIG_AR9170_USB) += ar9170usb.o | 3 | obj-$(CONFIG_AR9170_USB) += ar9170usb.o |
diff --git a/drivers/net/wireless/ar9170/cmd.c b/drivers/net/wireless/ar9170/cmd.c index fd5625c4e9d7..f57a6200167b 100644 --- a/drivers/net/wireless/ar9170/cmd.c +++ b/drivers/net/wireless/ar9170/cmd.c | |||
@@ -127,4 +127,3 @@ int ar9170_echo_test(struct ar9170 *ar, u32 v) | |||
127 | 127 | ||
128 | return 0; | 128 | return 0; |
129 | } | 129 | } |
130 | EXPORT_SYMBOL_GPL(ar9170_echo_test); | ||
diff --git a/drivers/net/wireless/ar9170/main.c b/drivers/net/wireless/ar9170/main.c index f8c2357a1738..5996ff9f7f47 100644 --- a/drivers/net/wireless/ar9170/main.c +++ b/drivers/net/wireless/ar9170/main.c | |||
@@ -37,14 +37,6 @@ | |||
37 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 37 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
38 | */ | 38 | */ |
39 | 39 | ||
40 | /* | ||
41 | * BIG FAT TODO: | ||
42 | * | ||
43 | * By the looks of things: these devices share a lot of things like | ||
44 | * EEPROM layout/design and PHY code with other Atheros WIFI products. | ||
45 | * So this driver/library will eventually become ath9k code... or vice versa ;-) | ||
46 | */ | ||
47 | |||
48 | #include <linux/init.h> | 40 | #include <linux/init.h> |
49 | #include <linux/module.h> | 41 | #include <linux/module.h> |
50 | #include <linux/etherdevice.h> | 42 | #include <linux/etherdevice.h> |
@@ -56,9 +48,6 @@ | |||
56 | static int modparam_nohwcrypt; | 48 | static int modparam_nohwcrypt; |
57 | module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO); | 49 | module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO); |
58 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); | 50 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); |
59 | MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); | ||
60 | MODULE_LICENSE("GPL"); | ||
61 | MODULE_DESCRIPTION("Atheros shared code for AR9170 wireless devices"); | ||
62 | 51 | ||
63 | #define RATE(_bitrate, _hw_rate, _txpidx, _flags) { \ | 52 | #define RATE(_bitrate, _hw_rate, _txpidx, _flags) { \ |
64 | .bitrate = (_bitrate), \ | 53 | .bitrate = (_bitrate), \ |
@@ -247,7 +236,6 @@ void ar9170_handle_tx_status(struct ar9170 *ar, struct sk_buff *skb, | |||
247 | skb_pull(skb, sizeof(struct ar9170_tx_control)); | 236 | skb_pull(skb, sizeof(struct ar9170_tx_control)); |
248 | ieee80211_tx_status_irqsafe(ar->hw, skb); | 237 | ieee80211_tx_status_irqsafe(ar->hw, skb); |
249 | } | 238 | } |
250 | EXPORT_SYMBOL_GPL(ar9170_handle_tx_status); | ||
251 | 239 | ||
252 | static struct sk_buff *ar9170_find_skb_in_queue(struct ar9170 *ar, | 240 | static struct sk_buff *ar9170_find_skb_in_queue(struct ar9170 *ar, |
253 | const u8 *mac, | 241 | const u8 *mac, |
@@ -630,13 +618,6 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len) | |||
630 | ieee80211_rx_irqsafe(ar->hw, skb, &status); | 618 | ieee80211_rx_irqsafe(ar->hw, skb, &status); |
631 | } | 619 | } |
632 | 620 | ||
633 | /* | ||
634 | * TODO: | ||
635 | * It looks like AR9170 supports more than just the USB transport interface. | ||
636 | * Unfortunately, there is no available information what parts of the | ||
637 | * precendent and following code fragments is device specific and what not. | ||
638 | * For now, everything stays here, until some SPI chips pop up. | ||
639 | */ | ||
640 | void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb) | 621 | void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb) |
641 | { | 622 | { |
642 | unsigned int i, tlen, resplen; | 623 | unsigned int i, tlen, resplen; |
@@ -694,7 +675,6 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb) | |||
694 | printk(KERN_ERR "%s: buffer remains!\n", | 675 | printk(KERN_ERR "%s: buffer remains!\n", |
695 | wiphy_name(ar->hw->wiphy)); | 676 | wiphy_name(ar->hw->wiphy)); |
696 | } | 677 | } |
697 | EXPORT_SYMBOL_GPL(ar9170_rx); | ||
698 | 678 | ||
699 | #define AR9170_FILL_QUEUE(queue, ai_fs, cwmin, cwmax, _txop) \ | 679 | #define AR9170_FILL_QUEUE(queue, ai_fs, cwmin, cwmax, _txop) \ |
700 | do { \ | 680 | do { \ |
@@ -1582,7 +1562,6 @@ void *ar9170_alloc(size_t priv_size) | |||
1582 | 1562 | ||
1583 | return ar; | 1563 | return ar; |
1584 | } | 1564 | } |
1585 | EXPORT_SYMBOL_GPL(ar9170_alloc); | ||
1586 | 1565 | ||
1587 | static int ar9170_read_eeprom(struct ar9170 *ar) | 1566 | static int ar9170_read_eeprom(struct ar9170 *ar) |
1588 | { | 1567 | { |
@@ -1680,7 +1659,6 @@ err_unreg: | |||
1680 | err_out: | 1659 | err_out: |
1681 | return err; | 1660 | return err; |
1682 | } | 1661 | } |
1683 | EXPORT_SYMBOL_GPL(ar9170_register); | ||
1684 | 1662 | ||
1685 | void ar9170_unregister(struct ar9170 *ar) | 1663 | void ar9170_unregister(struct ar9170 *ar) |
1686 | { | 1664 | { |
@@ -1691,21 +1669,3 @@ void ar9170_unregister(struct ar9170 *ar) | |||
1691 | ieee80211_unregister_hw(ar->hw); | 1669 | ieee80211_unregister_hw(ar->hw); |
1692 | mutex_destroy(&ar->mutex); | 1670 | mutex_destroy(&ar->mutex); |
1693 | } | 1671 | } |
1694 | EXPORT_SYMBOL_GPL(ar9170_unregister); | ||
1695 | |||
1696 | static int __init ar9170_init(void) | ||
1697 | { | ||
1698 | if (modparam_nohwcrypt) | ||
1699 | printk(KERN_INFO "ar9170: cryptographic acceleration " | ||
1700 | "disabled.\n"); | ||
1701 | |||
1702 | return 0; | ||
1703 | } | ||
1704 | |||
1705 | static void __exit ar9170_exit(void) | ||
1706 | { | ||
1707 | |||
1708 | } | ||
1709 | |||
1710 | module_init(ar9170_init); | ||
1711 | module_exit(ar9170_exit); | ||
diff --git a/drivers/net/wireless/ar9170/usb.c b/drivers/net/wireless/ar9170/usb.c index ede511e40475..ad296840893e 100644 --- a/drivers/net/wireless/ar9170/usb.c +++ b/drivers/net/wireless/ar9170/usb.c | |||
@@ -47,9 +47,10 @@ | |||
47 | #include "hw.h" | 47 | #include "hw.h" |
48 | #include "usb.h" | 48 | #include "usb.h" |
49 | 49 | ||
50 | MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); | ||
50 | MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>"); | 51 | MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>"); |
51 | MODULE_LICENSE("GPL"); | 52 | MODULE_LICENSE("GPL"); |
52 | MODULE_DESCRIPTION("USB Driver for Atheros AR9170 based devices"); | 53 | MODULE_DESCRIPTION("Atheros AR9170 802.11n USB wireless"); |
53 | MODULE_FIRMWARE("ar9170-1.fw"); | 54 | MODULE_FIRMWARE("ar9170-1.fw"); |
54 | MODULE_FIRMWARE("ar9170-2.fw"); | 55 | MODULE_FIRMWARE("ar9170-2.fw"); |
55 | 56 | ||