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>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 0cab1c1b6fd1..167bdb9cf68d 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -221,7 +221,7 @@ int ath6kl_control_tx(void *devt, struct sk_buff *skb,
          * This interface is asynchronous, if there is an error, cleanup
          * will happen in the TX completion callback.
          */
-        htc_tx(ar->htc_target, &cookie->htc_pkt);
+        ath6kl_htc_tx(ar->htc_target, &cookie->htc_pkt);
 
         return 0;
 
@@ -331,7 +331,7 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev)
          * HTC interface is asynchronous, if this fails, cleanup will
          * happen in the ath6kl_tx_complete callback.
          */
-        htc_tx(ar->htc_target, &cookie->htc_pkt);
+        ath6kl_htc_tx(ar->htc_target, &cookie->htc_pkt);
 
         return 0;
 
@@ -403,7 +403,7 @@ void ath6kl_indicate_tx_activity(void *devt, u8 traffic_class, bool active)
 
 notify_htc:
         /* notify HTC, this may cause credit distribution changes */
-        htc_indicate_activity_change(ar->htc_target, eid, active);
+        ath6kl_htc_indicate_activity_change(ar->htc_target, eid, active);
 }
 
 enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,
@@ -611,8 +611,8 @@ void ath6kl_tx_data_cleanup(struct ath6kl *ar)
 
         /* flush all the data (non-control) streams */
         for (i = 0; i < WMM_NUM_AC; i++)
-                htc_flush_txep(ar->htc_target, ar->ac2ep_map[i],
-                                 ATH6KL_DATA_PKT_TAG);
+                ath6kl_htc_flush_txep(ar->htc_target, ar->ac2ep_map[i],
+                                      ATH6KL_DATA_PKT_TAG);
 }
 
 /* Rx functions */
@@ -672,7 +672,7 @@ void ath6kl_rx_refill(struct htc_target *target, enum htc_endpoint_id endpoint)
         struct list_head queue;
 
         n_buf_refill = ATH6KL_MAX_RX_BUFFERS -
-                          htc_get_rxbuf_num(ar->htc_target, endpoint);
+                          ath6kl_htc_get_rxbuf_num(ar->htc_target, endpoint);
 
         if (n_buf_refill <= 0)
                 return;
@@ -695,7 +695,7 @@ void ath6kl_rx_refill(struct htc_target *target, enum htc_endpoint_id endpoint)
         }
 
         if (!list_empty(&queue))
-                htc_add_rxbuf_multiple(ar->htc_target, &queue);
+                ath6kl_htc_add_rxbuf_multiple(ar->htc_target, &queue);
 }
 
 void ath6kl_refill_amsdu_rxbufs(struct ath6kl *ar, int count)