ath6kl: fix function name conflicts with ath9k
Stephen reported that compilation fails if both ath6kl and ath9k are
compiled in:
drivers/net/wireless/ath/ath6kl/built-in.o: In function `htc_start':
(.opd+0x600): multiple definition of `htc_start'
drivers/net/wireless/ath/ath9k/built-in.o:(.opd+0x3e40): first defined here
drivers/net/wireless/ath/ath6kl/built-in.o: In function `.htc_stop':
(.text+0x7b40): multiple definition of `.htc_stop'
drivers/net/wireless/ath/ath9k/built-in.o:(.text+0x67b34): first defined he=
re
drivers/net/wireless/ath/ath6kl/built-in.o: In function `.htc_start':
(.text+0x7d18): multiple definition of `.htc_start'
drivers/net/wireless/ath/ath9k/built-in.o:(.text+0x67ba0): first defined he=
re
drivers/net/wireless/ath/ath6kl/built-in.o: In function `htc_stop':
(.opd+0x5e8): multiple definition of `htc_stop'
drivers/net/wireless/ath/ath9k/built-in.o:(.opd+0x3e28): first defined here
To fix this add ath6kl prefix to all public functions in htc.c.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 99ff2f9..9d10322 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -160,7 +160,7 @@
memset(&response, 0, sizeof(response));
- status = htc_conn_service(ar->htc_target, con_req, &response);
+ status = ath6kl_htc_conn_service(ar->htc_target, con_req, &response);
if (status) {
ath6kl_err("failed to connect to %s service status:%d\n",
desc, status);
@@ -1069,7 +1069,7 @@
* driver layer has to init BMI in order to set the host block
* size.
*/
- if (htc_wait_target(ar->htc_target)) {
+ if (ath6kl_htc_wait_target(ar->htc_target)) {
status = -EIO;
goto err_node_cleanup;
}
@@ -1098,7 +1098,7 @@
ath6kl_cookie_init(ar);
/* start HTC */
- status = htc_start(ar->htc_target);
+ status = ath6kl_htc_start(ar->htc_target);
if (status) {
ath6kl_cookie_cleanup(ar);
@@ -1138,9 +1138,9 @@
goto ath6kl_init_done;
err_htc_stop:
- htc_stop(ar->htc_target);
+ ath6kl_htc_stop(ar->htc_target);
err_rxbuf_cleanup:
- htc_flush_rx_buf(ar->htc_target);
+ ath6kl_htc_flush_rx_buf(ar->htc_target);
ath6kl_cleanup_amsdu_rxbufs(ar);
err_cleanup_scatter:
ath6kl_hif_cleanup_scatter(ar);
@@ -1179,7 +1179,7 @@
if (ret)
goto err_bmi_cleanup;
- ar->htc_target = htc_create(ar);
+ ar->htc_target = ath6kl_htc_create(ar);
if (!ar->htc_target) {
ret = -ENOMEM;
@@ -1217,7 +1217,7 @@
return ret;
err_htc_cleanup:
- htc_cleanup(ar->htc_target);
+ ath6kl_htc_cleanup(ar->htc_target);
err_bmi_cleanup:
ath6kl_bmi_cleanup(ar);
err_wq:
@@ -1275,7 +1275,7 @@
destroy_workqueue(ar->ath6kl_wq);
if (ar->htc_target)
- htc_cleanup(ar->htc_target);
+ ath6kl_htc_cleanup(ar->htc_target);
aggr_module_destroy(ar->aggr_cntxt);