diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2010-03-24 04:12:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-24 10:26:01 -0400 |
commit | e1572c5eeca8ef87a250322364584458b2dadb35 (patch) | |
tree | 242be3b9ddf8888ed728936d3354fee0b23260d4 /drivers | |
parent | c5a079f46aabff026b2acaba0a2579a74c3c3731 (diff) |
ath9k_htc: Fix symbol collision with ath9k
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 22 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 4 |
4 files changed, 28 insertions, 28 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index ab09fe3416c7..777064945fca 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -41,7 +41,7 @@ | |||
41 | ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) | 41 | ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10)) |
42 | 42 | ||
43 | extern struct ieee80211_ops ath9k_htc_ops; | 43 | extern struct ieee80211_ops ath9k_htc_ops; |
44 | extern int modparam_nohwcrypt; | 44 | extern int htc_modparam_nohwcrypt; |
45 | 45 | ||
46 | enum htc_phymode { | 46 | enum htc_phymode { |
47 | HTC_MODE_AUTO = 0, | 47 | HTC_MODE_AUTO = 0, |
@@ -408,8 +408,8 @@ void ath9k_tx_cleanup(struct ath9k_htc_priv *priv); | |||
408 | bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, | 408 | bool ath9k_htc_txq_setup(struct ath9k_htc_priv *priv, |
409 | enum ath9k_tx_queue_subtype qtype); | 409 | enum ath9k_tx_queue_subtype qtype); |
410 | int get_hw_qnum(u16 queue, int *hwq_map); | 410 | int get_hw_qnum(u16 queue, int *hwq_map); |
411 | int ath_txq_update(struct ath9k_htc_priv *priv, int qnum, | 411 | int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum, |
412 | struct ath9k_tx_queue_info *qinfo); | 412 | struct ath9k_tx_queue_info *qinfo); |
413 | 413 | ||
414 | int ath9k_rx_init(struct ath9k_htc_priv *priv); | 414 | int ath9k_rx_init(struct ath9k_htc_priv *priv); |
415 | void ath9k_rx_cleanup(struct ath9k_htc_priv *priv); | 415 | void ath9k_rx_cleanup(struct ath9k_htc_priv *priv); |
@@ -427,15 +427,15 @@ void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug); | |||
427 | int ath9k_htc_resume(struct htc_target *htc_handle); | 427 | int ath9k_htc_resume(struct htc_target *htc_handle); |
428 | #endif | 428 | #endif |
429 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS | 429 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS |
430 | int ath9k_debug_create_root(void); | 430 | int ath9k_htc_debug_create_root(void); |
431 | void ath9k_debug_remove_root(void); | 431 | void ath9k_htc_debug_remove_root(void); |
432 | int ath9k_init_debug(struct ath_hw *ah); | 432 | int ath9k_htc_init_debug(struct ath_hw *ah); |
433 | void ath9k_exit_debug(struct ath_hw *ah); | 433 | void ath9k_htc_exit_debug(struct ath_hw *ah); |
434 | #else | 434 | #else |
435 | static inline int ath9k_debug_create_root(void) { return 0; }; | 435 | static inline int ath9k_htc_debug_create_root(void) { return 0; }; |
436 | static inline void ath9k_debug_remove_root(void) {}; | 436 | static inline void ath9k_htc_debug_remove_root(void) {}; |
437 | static inline int ath9k_init_debug(struct ath_hw *ah) { return 0; }; | 437 | static inline int ath9k_htc_init_debug(struct ath_hw *ah) { return 0; }; |
438 | static inline void ath9k_exit_debug(struct ath_hw *ah) {}; | 438 | static inline void ath9k_htc_exit_debug(struct ath_hw *ah) {}; |
439 | #endif /* CONFIG_ATH9K_HTC_DEBUGFS */ | 439 | #endif /* CONFIG_ATH9K_HTC_DEBUGFS */ |
440 | 440 | ||
441 | #endif /* HTC_H */ | 441 | #endif /* HTC_H */ |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index a653dec140b9..10c87605d2c4 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -24,8 +24,8 @@ static unsigned int ath9k_debug = ATH_DBG_DEFAULT; | |||
24 | module_param_named(debug, ath9k_debug, uint, 0); | 24 | module_param_named(debug, ath9k_debug, uint, 0); |
25 | MODULE_PARM_DESC(debug, "Debugging mask"); | 25 | MODULE_PARM_DESC(debug, "Debugging mask"); |
26 | 26 | ||
27 | int modparam_nohwcrypt; | 27 | int htc_modparam_nohwcrypt; |
28 | module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444); | 28 | module_param_named(nohwcrypt, htc_modparam_nohwcrypt, int, 0444); |
29 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); | 29 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); |
30 | 30 | ||
31 | #define CHAN2G(_freq, _idx) { \ | 31 | #define CHAN2G(_freq, _idx) { \ |
@@ -93,7 +93,7 @@ static int ath9k_htc_wait_for_target(struct ath9k_htc_priv *priv) | |||
93 | 93 | ||
94 | static void ath9k_deinit_priv(struct ath9k_htc_priv *priv) | 94 | static void ath9k_deinit_priv(struct ath9k_htc_priv *priv) |
95 | { | 95 | { |
96 | ath9k_exit_debug(priv->ah); | 96 | ath9k_htc_exit_debug(priv->ah); |
97 | ath9k_hw_deinit(priv->ah); | 97 | ath9k_hw_deinit(priv->ah); |
98 | tasklet_kill(&priv->wmi_tasklet); | 98 | tasklet_kill(&priv->wmi_tasklet); |
99 | tasklet_kill(&priv->rx_tasklet); | 99 | tasklet_kill(&priv->rx_tasklet); |
@@ -474,7 +474,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, u16 devid) | |||
474 | goto err_hw; | 474 | goto err_hw; |
475 | } | 475 | } |
476 | 476 | ||
477 | ret = ath9k_init_debug(ah); | 477 | ret = ath9k_htc_init_debug(ah); |
478 | if (ret) { | 478 | if (ret) { |
479 | ath_print(common, ATH_DBG_FATAL, | 479 | ath_print(common, ATH_DBG_FATAL, |
480 | "Unable to create debugfs files\n"); | 480 | "Unable to create debugfs files\n"); |
@@ -492,7 +492,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, u16 devid) | |||
492 | return 0; | 492 | return 0; |
493 | 493 | ||
494 | err_queues: | 494 | err_queues: |
495 | ath9k_exit_debug(ah); | 495 | ath9k_htc_exit_debug(ah); |
496 | err_debug: | 496 | err_debug: |
497 | ath9k_hw_deinit(ah); | 497 | ath9k_hw_deinit(ah); |
498 | err_hw: | 498 | err_hw: |
@@ -678,7 +678,7 @@ static int __init ath9k_htc_init(void) | |||
678 | { | 678 | { |
679 | int error; | 679 | int error; |
680 | 680 | ||
681 | error = ath9k_debug_create_root(); | 681 | error = ath9k_htc_debug_create_root(); |
682 | if (error < 0) { | 682 | if (error < 0) { |
683 | printk(KERN_ERR | 683 | printk(KERN_ERR |
684 | "ath9k_htc: Unable to create debugfs root: %d\n", | 684 | "ath9k_htc: Unable to create debugfs root: %d\n", |
@@ -698,7 +698,7 @@ static int __init ath9k_htc_init(void) | |||
698 | return 0; | 698 | return 0; |
699 | 699 | ||
700 | err_usb: | 700 | err_usb: |
701 | ath9k_debug_remove_root(); | 701 | ath9k_htc_debug_remove_root(); |
702 | err_dbg: | 702 | err_dbg: |
703 | return error; | 703 | return error; |
704 | } | 704 | } |
@@ -707,7 +707,7 @@ module_init(ath9k_htc_init); | |||
707 | static void __exit ath9k_htc_exit(void) | 707 | static void __exit ath9k_htc_exit(void) |
708 | { | 708 | { |
709 | ath9k_hif_usb_exit(); | 709 | ath9k_hif_usb_exit(); |
710 | ath9k_debug_remove_root(); | 710 | ath9k_htc_debug_remove_root(); |
711 | printk(KERN_INFO "ath9k_htc: Driver unloaded\n"); | 711 | printk(KERN_INFO "ath9k_htc: Driver unloaded\n"); |
712 | } | 712 | } |
713 | module_exit(ath9k_htc_exit); | 713 | module_exit(ath9k_htc_exit); |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 3184a2ac7b88..20a2c1341e20 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -595,7 +595,7 @@ static const struct file_operations fops_recv = { | |||
595 | .owner = THIS_MODULE | 595 | .owner = THIS_MODULE |
596 | }; | 596 | }; |
597 | 597 | ||
598 | int ath9k_init_debug(struct ath_hw *ah) | 598 | int ath9k_htc_init_debug(struct ath_hw *ah) |
599 | { | 599 | { |
600 | struct ath_common *common = ath9k_hw_common(ah); | 600 | struct ath_common *common = ath9k_hw_common(ah); |
601 | struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv; | 601 | struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv; |
@@ -630,11 +630,11 @@ int ath9k_init_debug(struct ath_hw *ah) | |||
630 | return 0; | 630 | return 0; |
631 | 631 | ||
632 | err: | 632 | err: |
633 | ath9k_exit_debug(ah); | 633 | ath9k_htc_exit_debug(ah); |
634 | return -ENOMEM; | 634 | return -ENOMEM; |
635 | } | 635 | } |
636 | 636 | ||
637 | void ath9k_exit_debug(struct ath_hw *ah) | 637 | void ath9k_htc_exit_debug(struct ath_hw *ah) |
638 | { | 638 | { |
639 | struct ath_common *common = ath9k_hw_common(ah); | 639 | struct ath_common *common = ath9k_hw_common(ah); |
640 | struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv; | 640 | struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv; |
@@ -645,7 +645,7 @@ void ath9k_exit_debug(struct ath_hw *ah) | |||
645 | debugfs_remove(priv->debug.debugfs_phy); | 645 | debugfs_remove(priv->debug.debugfs_phy); |
646 | } | 646 | } |
647 | 647 | ||
648 | int ath9k_debug_create_root(void) | 648 | int ath9k_htc_debug_create_root(void) |
649 | { | 649 | { |
650 | ath9k_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL); | 650 | ath9k_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL); |
651 | if (!ath9k_debugfs_root) | 651 | if (!ath9k_debugfs_root) |
@@ -654,7 +654,7 @@ int ath9k_debug_create_root(void) | |||
654 | return 0; | 654 | return 0; |
655 | } | 655 | } |
656 | 656 | ||
657 | void ath9k_debug_remove_root(void) | 657 | void ath9k_htc_debug_remove_root(void) |
658 | { | 658 | { |
659 | debugfs_remove(ath9k_debugfs_root); | 659 | debugfs_remove(ath9k_debugfs_root); |
660 | ath9k_debugfs_root = NULL; | 660 | ath9k_debugfs_root = NULL; |
@@ -1358,7 +1358,7 @@ static int ath9k_htc_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
1358 | queue, qnum, params->aifs, params->cw_min, | 1358 | queue, qnum, params->aifs, params->cw_min, |
1359 | params->cw_max, params->txop); | 1359 | params->cw_max, params->txop); |
1360 | 1360 | ||
1361 | ret = ath_txq_update(priv, qnum, &qi); | 1361 | ret = ath_htc_txq_update(priv, qnum, &qi); |
1362 | if (ret) | 1362 | if (ret) |
1363 | ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n"); | 1363 | ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n"); |
1364 | 1364 | ||
@@ -1377,7 +1377,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw, | |||
1377 | struct ath_common *common = ath9k_hw_common(priv->ah); | 1377 | struct ath_common *common = ath9k_hw_common(priv->ah); |
1378 | int ret = 0; | 1378 | int ret = 0; |
1379 | 1379 | ||
1380 | if (modparam_nohwcrypt) | 1380 | if (htc_modparam_nohwcrypt) |
1381 | return -ENOSPC; | 1381 | return -ENOSPC; |
1382 | 1382 | ||
1383 | mutex_lock(&priv->mutex); | 1383 | mutex_lock(&priv->mutex); |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index dba22d3f87c3..ac66cf0b2d53 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | |||
@@ -36,8 +36,8 @@ int get_hw_qnum(u16 queue, int *hwq_map) | |||
36 | } | 36 | } |
37 | } | 37 | } |
38 | 38 | ||
39 | int ath_txq_update(struct ath9k_htc_priv *priv, int qnum, | 39 | int ath_htc_txq_update(struct ath9k_htc_priv *priv, int qnum, |
40 | struct ath9k_tx_queue_info *qinfo) | 40 | struct ath9k_tx_queue_info *qinfo) |
41 | { | 41 | { |
42 | struct ath_hw *ah = priv->ah; | 42 | struct ath_hw *ah = priv->ah; |
43 | int error = 0; | 43 | int error = 0; |