ath10k: kill CE_SEND_CB/CE_RECV_CB
PATCH 1/3 ath10k: kill CE_SEND_CB/CE_RECV_CB
kill typedefs
CE_SEND_CB/CE_RECV_CB
Signed-off-by Janusz Dziedzic <[email protected]>
--- drivers/net/wireless/ath/ath10k/ce.c | 17 ++++++++++---- drivers/net/wireless/ath/ath10k/ce.h | 43 +++++++++++++++++----------------- 2 files changed, 35 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/ath10k/ce.c +13 -4
@@ -667,26 +667,35 @@ void ath10k_ce_disable_interrupts(struct ath10k *ar) }void ath10k_ce_send_cb_register (struct ce_state *ce_state, -CE_SEND_CB fn_ptr, +void (*send_cb) (struct ce_state *ce_state, +void *per_transfer_send_context, +u32 buffer, +unsigned int nbytes, +unsigned int transfer_id),int disable_interrupts) {struct ath10k *ar = ce_state->ar;struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);spin_lock_bh (&ar_pci->ce_lock); - ce_state->send_cb = fn_ptr; + ce_state->send_cb = send_cb;ath10k_ce_per_engine_handler_adjust (ce_state, disable_interrupts);spin_unlock_bh (&ar_pci->ce_lock); }void ath10k_ce_recv_cb_register (struct ce_state *ce_state, -CE_RECV_CB fn_ptr) +void (*recv_cb) (struct ce_state *ce_state, +void *per_transfer_recv_context, +u32 buffer, +unsigned int nbytes, +unsigned int transfer_id, +unsigned int flags)) {struct ath10k *ar = ce_state->ar;struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);spin_lock_bh (&ar_pci->ce_lock); - ce_state->recv_cb = fn_ptr; + ce_state->recv_cb = recv_cb;ath10k_ce_per_engine_handler_adjust (ce_state,0 );spin_unlock_bh (&ar_pci->ce_lock); }
drivers/net/wireless/ath/ath10k/ce.h +22 -21
67 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/3 ath10k: kill WARN_ON in ce.c
Kill WARN_ON in ce.c, use ath10k_warn() instead.
Signed-off-by Janusz Dziedzic <[email protected]>
--- drivers/net/wireless/ath/ath10k/ce.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/ce.c +3 -1
@@ -82,7 +82,9 @@ static int ath10k_ce_send_nolock(struct ce_state *ce_state,u32 desc_flags =0 ;int ret =0 ; -WARN_ON (nbytes > ce_state->src_sz_max); +if (nbytes > ce_state->src_sz_max) +ath10k_warn ("%s: send more we can (nbytes: %d, max: %d)\n" , + __func__, nbytes, ce_state->src_sz_max);TARGET_ACCESS_BEGIN (ar);
Signature · 1 line
1.7.9.5
PATCH 3/3 ath10k: kill MAX_SSID_LEN define
In reply to Janusz DziedzicUse IEEE80211_MAX_SSID_LEN instead.
Signed-off-by Janusz Dziedzic <[email protected]>
--- drivers/net/wireless/ath/ath10k/core.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +1 -2
@@ -34,7 +34,6 @@#define SM (_v, _f) (((_v) << _f##_LSB) & _f##_MASK)#define WO (_f) ((_f##_OFFSET) >> 2) -#define MAX_SSID_LEN 32#define ATH10K_SCAN_ID 0#define WMI_READY_TIMEOUT (5 * HZ)#define ATH10K_FLUSH_TIMEOUT_HZ (5*HZ)
@@ -216,7 +215,7 @@ struct ath10k_vif {u8 tim_bitmap[16 ];u8 tim_len;u32 ssid_len; -u8 ssid[MAX_SSID_LEN ]; +u8 ssid[IEEE80211_MAX_SSID_LEN ];bool hidden_ssid;/* P2P_IE with NoA attribute for P2P_GO case */ u32 noa_len;
Signature · 1 line
1.7.9.5
PATCH 1/3 ath10k: kill CE_SEND_CB/CE_RECV_CB
In reply to Janusz DziedzicQuoted 4 lines · Janusz Dziedzic
kill typedefs
CE_SEND_CB/CE_RECV_CBSigned-off-by Janusz Dziedzic <[email protected]>
Thanks, all three patches applied. Patch 2 had conflicts, please check I didn't break anything.
Signature · 1 line
Kalle Valo