-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathfix-ath9k-naming-conflict.patch
138 lines (119 loc) · 5.33 KB
/
fix-ath9k-naming-conflict.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
From a947cee612f6a896740b66395f7d22f77b39900f Mon Sep 17 00:00:00 2001
From: Re4son <Re4son@users.noreply.github.com>
Date: Thu, 22 Aug 2019 12:02:38 +1000
Subject: [PATCH] Resolve conflict with wcn39xx driver
Signed-off-by: Re4son <Re4son@users.noreply.github.com>
---
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 6 +++---
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +++---
drivers/net/wireless/ath/ath9k/htc_hst.h | 6 +++---
drivers/net/wireless/ath/ath9k/wmi.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index da2164b0cccc..752bdcf50bfc 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -134,7 +134,7 @@ static inline int ath9k_htc_connect_svc(struct ath9k_htc_priv *priv,
req.ep_callbacks.rx = ath9k_htc_rxep;
req.ep_callbacks.tx = tx;
- return htc_connect_service(priv->htc, &req, ep_id);
+ return htc_connect_service_hst(priv->htc, &req, ep_id);
}
static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid,
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index a553c91d41a1..c4328f351c5d 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -226,7 +226,7 @@ void ath9k_htc_reset(struct ath9k_htc_priv *priv)
WMI_CMD_BUF(WMI_SET_MODE_CMDID, &htc_mode);
WMI_CMD(WMI_ENABLE_INTR_CMDID);
- htc_start(priv->htc);
+ htc_start_hst(priv->htc);
ath9k_htc_vif_reconfig(priv);
ieee80211_wake_queues(priv->hw);
@@ -302,7 +302,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
if (ret)
goto err;
- htc_start(priv->htc);
+ htc_start_hst(priv->htc);
if (!test_bit(ATH_OP_SCANNING, &common->op_flags) &&
!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
@@ -955,7 +955,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
"Failed to update capability in target\n");
clear_bit(ATH_OP_INVALID, &common->op_flags);
- htc_start(priv->htc);
+ htc_start_hst(priv->htc);
spin_lock_bh(&priv->tx.tx_lock);
priv->tx.flags &= ~ATH9K_HTC_OP_TX_QUEUES_STOP;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index b38a586ea59a..aecf391bd4c5 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -543,7 +543,7 @@ void ath9k_htc_tx_drain(struct ath9k_htc_priv *priv)
* Ensure that all pending TX frames are flushed,
* and that the TX completion/failed tasklets is killed.
*/
- htc_stop(priv->htc);
+ htc_stop_hst(priv->htc);
tasklet_kill(&priv->wmi->wmi_event_tasklet);
tasklet_kill(&priv->tx_failed_tasklet);
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 1bf63a4efb4c..13755c7c50ca 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -228,7 +228,7 @@ int htc_init(struct htc_target *target)
return htc_setup_complete(target);
}
-int htc_connect_service(struct htc_target *target,
+int htc_connect_service_hst(struct htc_target *target,
struct htc_service_connreq *service_connreq,
enum htc_endpoint_id *conn_rsp_epid)
{
@@ -301,12 +301,12 @@ int htc_send_epid(struct htc_target *target, struct sk_buff *skb,
return htc_issue_send(target, skb, skb->len, 0, epid);
}
-void htc_stop(struct htc_target *target)
+void htc_stop_hst(struct htc_target *target)
{
target->hif->stop(target->hif_dev);
}
-void htc_start(struct htc_target *target)
+void htc_start_hst(struct htc_target *target)
{
target->hif->start(target->hif_dev);
}
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.h b/drivers/net/wireless/ath/ath9k/htc_hst.h
index 06474ccc7696..0bd3e6b7199b 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.h
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.h
@@ -203,14 +203,14 @@ struct htc_comp_msg {
} __packed;
int htc_init(struct htc_target *target);
-int htc_connect_service(struct htc_target *target,
+int htc_connect_service_hst(struct htc_target *target,
struct htc_service_connreq *service_connreq,
enum htc_endpoint_id *conn_rsp_eid);
int htc_send(struct htc_target *target, struct sk_buff *skb);
int htc_send_epid(struct htc_target *target, struct sk_buff *skb,
enum htc_endpoint_id epid);
-void htc_stop(struct htc_target *target);
-void htc_start(struct htc_target *target);
+void htc_stop_hst(struct htc_target *target);
+void htc_start_hst(struct htc_target *target);
void htc_sta_drain(struct htc_target *target, u8 idx);
void ath9k_htc_rx_msg(struct htc_target *htc_handle,
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 64a354fa78ab..6c6d41845f4d 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -261,7 +261,7 @@ int ath9k_wmi_connect(struct htc_target *htc, struct wmi *wmi,
connect.ep_callbacks.rx = ath9k_wmi_ctrl_rx;
connect.service_id = WMI_CONTROL_SVC;
- ret = htc_connect_service(htc, &connect, &wmi->ctrl_epid);
+ ret = htc_connect_service_hst(htc, &connect, &wmi->ctrl_epid);
if (ret)
return ret;
--
2.25.1