ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN
PATCH 1/1 ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN
Removed the macro MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN in the ath11k_dp_rx_h_undecap_raw() in dp_rx.c.
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -3
@@ -1453,8 +1453,6 @@ static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar,ether_addr_copy (ieee80211_get_SA (hdr), sa); } -#define MICHAEL_MIC_LEN 8 - static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu, enum hal_encrypt_type enctype, struct ieee80211_rx_status *status,
@@ -1501,7 +1499,7 @@ static void ath11k_dp_rx_h_undecap_raw(struct ath11k *ar, struct sk_buff *msdu,if ((status->flag &RX_FLAG_MMIC_STRIPPED ) && !ieee80211_has_morefrags (hdr->frame_control) && enctype ==HAL_ENCRYPT_TYPE_TKIP_MIC ) -skb_trim (msdu, msdu->len -MICHAEL_MIC_LEN ); +skb_trim (msdu, msdu->len -IEEE80211_CCMP_MIC_LEN );/* Head */ if (status->flag &RX_FLAG_IV_STRIPPED ) {
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/1 ath11k: Removed unnecessary spaces before 'else if'
Removed unnecessary spaces before 'else if' in the ath11k_dp_rx_mon_merg_msdus().
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -1
@@ -3636,7 +3636,7 @@ ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar, prev_buf->next =NULL ;skb_trim (prev_buf, prev_buf->len -HAL_RX_FCS_LEN ); - }else if (decap_format ==DP_RX_DECAP_TYPE_NATIVE_WIFI ) { + }else if (decap_format ==DP_RX_DECAP_TYPE_NATIVE_WIFI ) {__le16 qos_field;u8 qos_pkt =0 ;
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH] ath11k: Removed unnecessary spaces before 'else if'
Quoted 5 lines · Maharaja Kennadyrajan
Removed unnecessary spaces before 'else if' in the
ath11k_dp_rx_mon_merg_msdus().Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
23a819176833 ath11k: Removed unnecessary spaces before 'else if'
Signature · 9 lines
https://patchwork.kernel.org/patch/10989371/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
cover Added prefix in dp_tx.c and dp_rx.c files
In reply to Maharaja KennadyrajanAdded 'ath11k' prefix to the struct dp_htt_wbm_tx_status in the dp_tx.c and 'ath11k_dp_tx' prefix to all the functions in the dp_tx.c and dp_rx.c
Maharaja Kennadyrajan (2):
ath11k: Added 'ath11k' as prefix to the struct dp_htt_wbm_tx_status
ath11k: Added prefix to all the functions in dp_tx.c file
drivers/net/wireless/ath/ath11k/core.c | 2 +- drivers/net/wireless/ath/ath11k/debug.c | 12 +- .../net/wireless/ath/ath11k/debug_htt_stats.c | 10 +- drivers/net/wireless/ath/ath11k/dp.h | 4 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 47 +++---- drivers/net/wireless/ath/ath11k/dp_tx.c | 130 +++++++++--------- drivers/net/wireless/ath/ath11k/dp_tx.h | 33 ++--- drivers/net/wireless/ath/ath11k/mac.c | 5 +- 8 files changed, 124 insertions(+), 119 deletions(-)
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/2 ath11k: Added 'ath11k' as prefix to the struct dp_htt_wbm_tx_status
In reply to Maharaja KennadyrajanRenamed the struct dp_htt_wbm_tx_status by adding a prefix 'ath11k'.
--- drivers/net/wireless/ath/ath11k/dp_tx.c | 4 ++-- drivers/net/wireless/ath/ath11k/dp_tx.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/dp_tx.c +2 -2
@@ -248,7 +248,7 @@ static void ath11k_dp_free_txbuf(struct ath11k_base *ab, u8 mac_id,static void ath11k_dp_htt_tx_complete_buf (struct ath11k_base *ab,struct dp_tx_ring *tx_ring, -struct dp_htt_wbm_tx_status *ts) +struct ath11k_dp_htt_wbm_tx_status *ts) {struct sk_buff *msdu;struct ieee80211_tx_info *info;
@@ -300,7 +300,7 @@ ath11k_dp_process_htt_tx_complete(struct ath11k_base *ab, u32 msdu_id, struct dp_tx_ring *tx_ring) { struct htt_tx_wbm_completion *status_desc; -struct dp_htt_wbm_tx_status ts = {0 }; +struct ath11k_dp_htt_wbm_tx_status ts = {0 };enum hal_wbm_htt_tx_comp_status wbm_status; status_desc = desc +HTT_TX_WBM_COMP_STATUS_OFFSET ;
drivers/net/wireless/ath/ath11k/dp_tx.h +1 -1
@@ -9,7 +9,7 @@#include "core.h" #include "hal_tx.h" -struct dp_htt_wbm_tx_status { +struct ath11k_dp_htt_wbm_tx_status {u32 msdu_id;bool acked;int ack_rssi;
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 1/2] ath11k: Added 'ath11k' as prefix to the struct dp_htt_wbm_tx_status
Quoted 5 lines · Maharaja Kennadyrajan
Renamed the struct
dp_htt_wbm_tx_statusby adding a prefix 'ath11k'.Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath11k-bringup branch of ath.git, thanks.
78603c9f2986 ath11k: Added 'ath11k' as prefix to the struct dp_htt_wbm_tx_status 31f688e6d07a ath11k: Added prefix to all the functions in dp_tx.c file
Signature · 9 lines
https://patchwork.kernel.org/patch/10989375/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/2 ath11k: Added prefix to all the functions in dp_tx.c file
In reply to Maharaja KennadyrajanAdded a prefix "ath11k_dp_tx" to all the functions in the file dp_tx.c
--- drivers/net/wireless/ath/ath11k/core.c | 2 +- drivers/net/wireless/ath/ath11k/debug.c | 12 +- .../net/wireless/ath/ath11k/debug_htt_stats.c | 10 +- drivers/net/wireless/ath/ath11k/dp.h | 4 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 47 +++---- drivers/net/wireless/ath/ath11k/dp_tx.c | 128 +++++++++--------- drivers/net/wireless/ath/ath11k/dp_tx.h | 31 +++-- drivers/net/wireless/ath/ath11k/mac.c | 5 +- 8 files changed, 122 insertions(+), 117 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +1 -1
@@ -563,7 +563,7 @@ static int ath11k_core_start(struct ath11k_base *sc, goto err_hif_stop; } - ret =ath11k_dp_htt_h2t_ver_req_msg (sc); + ret =ath11k_dp_tx_htt_h2t_ver_req_msg (sc);if (ret) {ath11k_err (sc,"failed to send htt version request message: %d\n" , ret);
drivers/net/wireless/ath/ath11k/debug.c +6 -6
@@ -831,9 +831,9 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file, } ring_id = ar->dp.rx_mon_status_refill_ring.refill_buf_ring.ring_id; - ret =ath11k_dp_htt_rx_filter_setup (ar->ab, ring_id, ar->dp.mac_id, -HAL_RXDMA_MONITOR_STATUS , -DP_RX_BUFFER_SIZE , &tlv_filter); + ret =ath11k_dp_tx_htt_rx_filter_setup (ar->ab, ring_id, ar->dp.mac_id, +HAL_RXDMA_MONITOR_STATUS , +DP_RX_BUFFER_SIZE , &tlv_filter);if (ret) {ath11k_warn (ar->ab,"failed to set rx filter for moniter status ring\n" );
@@ -1061,9 +1061,9 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file, } ring_id = ar->dp.rx_mon_status_refill_ring.refill_buf_ring.ring_id; - ret =ath11k_dp_htt_rx_filter_setup (ar->ab, ring_id, ar->dp.mac_id, -HAL_RXDMA_MONITOR_STATUS , -DP_RX_BUFFER_SIZE , &tlv_filter); + ret =ath11k_dp_tx_htt_rx_filter_setup (ar->ab, ring_id, ar->dp.mac_id, +HAL_RXDMA_MONITOR_STATUS , +DP_RX_BUFFER_SIZE , &tlv_filter);if (ret) {ath11k_warn (ar->ab,"failed to set rx filter for moniter status ring\n" ); goto out;
drivers/net/wireless/ath/ath11k/debug_htt_stats.c +5 -5
@@ -4340,7 +4340,7 @@ int ath11k_dbg_htt_stats_req(struct ath11k *ar, }mutex_lock (&ar->conf_mutex); - ret =ath11k_dp_htt_h2t_ext_stats_req (ar, type, &cfg_params, cookie); + ret =ath11k_dp_tx_htt_h2t_ext_stats_req (ar, type, &cfg_params, cookie);if (ret) {ath11k_warn (ar->ab,"failed to send htt stats request: %d\n" , ret);mutex_unlock (&ar->conf_mutex);
@@ -4440,10 +4440,10 @@ static ssize_t ath11k_write_htt_stats_reset(struct file *file,mutex_lock (&ar->conf_mutex); cfg_params.cfg0 =HTT_STAT_DEFAULT_RESET_START_OFFSET ; cfg_params.cfg1 =1 << (cfg_params.cfg0 + type); - ret =ath11k_dp_htt_h2t_ext_stats_req (ar, -ATH11K_DBG_HTT_EXT_STATS_RESET , - &cfg_params, -0ULL ); + ret =ath11k_dp_tx_htt_h2t_ext_stats_req (ar, +ATH11K_DBG_HTT_EXT_STATS_RESET , + &cfg_params, +0ULL );if (ret) {ath11k_warn (ar->ab,"failed to send htt stats request: %d\n" , ret);mutex_unlock (&ar->conf_mutex);
drivers/net/wireless/ath/ath11k/dp.h +2 -2
@@ -1464,8 +1464,8 @@ void ath11k_dp_free(struct ath11k_base *sc);int ath11k_dp_alloc (struct ath11k_base *sc);int ath11k_dp_pdev_alloc (struct ath11k_base *ab);void ath11k_dp_pdev_free (struct ath11k_base *ab); -int ath11k_dp_htt_srng_setup (struct ath11k_base *ab,u32 ring_id, -int mac_id,enum hal_ring_type ring_type); +int ath11k_dp_tx_htt_srng_setup (struct ath11k_base *ab,u32 ring_id, +int mac_id,enum hal_ring_type ring_type);int ath11k_dp_peer_setup (struct ath11k *ar,int vdev_id,const u8 *addr);void ath11k_dp_peer_cleanup (struct ath11k *ar,int vdev_id,const u8 *addr);void ath11k_dp_srng_cleanup (struct ath11k_base *ab,struct dp_srng *ring);
drivers/net/wireless/ath/ath11k/dp_rx.c +24 -23
105 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_tx.c +65 -63
286 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_tx.h +16 -15
@@ -15,25 +15,26 @@ struct ath11k_dp_htt_wbm_tx_status {int ack_rssi; }; -int ath11k_dp_htt_h2t_ver_req_msg (struct ath11k_base *ab); +int ath11k_dp_tx_htt_h2t_ver_req_msg (struct ath11k_base *ab);int ath11k_dp_tx (struct ath11k *ar,struct ath11k_vif *arvif,struct sk_buff *skb);void ath11k_dp_tx_completion_handler (struct ath11k_base *ab,int ring_id); -int ath11k_dp_send_reo_cmd (struct ath11k_base *ab,struct dp_rx_tid *rx_tid, -enum hal_reo_cmd_type type, -struct ath11k_hal_reo_cmd *cmd, -void (*func)(struct ath11k_dp *,void *, -enum hal_reo_cmd_status )); +int ath11k_dp_tx_send_reo_cmd (struct ath11k_base *ab,struct dp_rx_tid *rx_tid, +enum hal_reo_cmd_type type, +struct ath11k_hal_reo_cmd *cmd, +void (*func)(struct ath11k_dp *,void *, +enum hal_reo_cmd_status )); -int ath11k_dp_htt_h2t_ppdu_stats_req (struct ath11k *ar,u32 mask); -int ath11k_dp_htt_h2t_ext_stats_req (struct ath11k *ar,u8 type, -struct htt_ext_stats_cfg_params *cfg_params, -u64 cookie); -int ath11k_dp_htt_monitor_mode_ring_config (struct ath11k *ar,bool reset); +int ath11k_dp_tx_htt_h2t_ppdu_stats_req (struct ath11k *ar,u32 mask); +int +ath11k_dp_tx_htt_h2t_ext_stats_req (struct ath11k *ar,u8 type, +struct htt_ext_stats_cfg_params *cfg_params, +u64 cookie); +int ath11k_dp_tx_htt_monitor_mode_ring_config (struct ath11k *ar,bool reset); -int ath11k_dp_htt_rx_filter_setup (struct ath11k_base *ab,u32 ring_id, -int mac_id,enum hal_ring_type ring_type, -int rx_buf_size, -struct htt_rx_ring_tlv_filter *tlv_filter); +int ath11k_dp_tx_htt_rx_filter_setup (struct ath11k_base *ab,u32 ring_id, +int mac_id,enum hal_ring_type ring_type, +int rx_buf_size, +struct htt_rx_ring_tlv_filter *tlv_filter);#endif
drivers/net/wireless/ath/ath11k/mac.c +3 -2
@@ -3638,7 +3638,8 @@ static int ath11k_start(struct ieee80211_hw *hw) goto err; } - ret =ath11k_dp_htt_h2t_ppdu_stats_req (ar,HTT_PPDU_STATS_TAG_DEFAULT ); + ret =ath11k_dp_tx_htt_h2t_ppdu_stats_req (ar, +HTT_PPDU_STATS_TAG_DEFAULT );if (ret) {ath11k_err (ab,"failed to req ppdu stats: %d\n" , ret); goto err;
@@ -4090,7 +4091,7 @@ static void ath11k_configure_filter(struct ieee80211_hw *hw,/* For monitor mode */ reset_flag = !(ar->filter_flags &FIF_BCN_PRBRESP_PROMISC ); - ret =ath11k_dp_htt_monitor_mode_ring_config (ar, reset_flag); + ret =ath11k_dp_tx_htt_monitor_mode_ring_config (ar, reset_flag);if (!ret) {if (!reset_flag)set_bit (ATH11K_FLAG_MONITOR_ENABLED , &ar->monitor_flags);
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/1 ath11k: Avoid unnecessary WARN_ON() in ath11k_dp_tx_complete_msdu()
In reply to Maharaja KennadyrajanIn order to avoid unnecessary WARN_ON in the function ath11k_dp_tx_complete_msdu, changed that WARN_ON to WARN_ON_ONCE.
--- drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/dp_tx.c +1 -1
@@ -358,7 +358,7 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,struct ieee80211_tx_info *info;struct ath11k_skb_cb *skb_cb; -if (WARN_ON (ts->buf_rel_source !=HAL_WBM_REL_SRC_MODULE_TQM )) { +if (WARN_ON_ONCE (ts->buf_rel_source !=HAL_WBM_REL_SRC_MODULE_TQM )) {/* Must not happen */ return ; }
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH] ath11k: Avoid unnecessary WARN_ON() in ath11k_dp_tx_complete_msdu()
Quoted 5 lines · Maharaja Kennadyrajan
In order to avoid unnecessary
WARN_ONin the functionath11k_dp_tx_complete_msdu, changed thatWARN_ONtoWARN_ON_ONCE.Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
f6598b82d86a ath11k: Avoid unnecessary WARN_ON() in ath11k_dp_tx_complete_msdu()
Signature · 9 lines
https://patchwork.kernel.org/patch/10989379/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/1 ath11k: Use firmware_request_nowarn to load firmware
In reply to Maharaja KennadyrajanThis reduces the unnecessary warning prints when we load the optional firmware files.
--- drivers/net/wireless/ath/ath11k/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/core.c +1 -1
@@ -58,7 +58,7 @@ static const struct firmware *ath11k_fetch_fw_file(struct ath11k_base *sc, dir ="." ;snprintf (filename,sizeof (filename),"%s/%s" , dir, file); - ret =request_firmware_direct (&fw, filename, sc->dev); + ret =firmware_request_nowarn (&fw, filename, sc->dev);ath11k_dbg (sc,ATH11K_DBG_BOOT ,"boot fw request '%s': %d\n" , filename, ret);
Signature · 7 lines
2.21.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH] ath11k: Use firmware_request_nowarn to load firmware
Quoted 5 lines · Maharaja Kennadyrajan
This reduces the unnecessary warning prints when we load the optional firmware files.
Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
cd4aedbba682 ath11k: Use firmware_request_nowarn to load firmware
Signature · 9 lines
https://patchwork.kernel.org/patch/10989381/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 5 lines · Maharaja Kennadyrajan
Removed the macro
MICHAEL_MIC_LENand useIEEE80211_CCMP_MIC_LENin theath11k_dp_rx_h_undecap_raw()indp_rx.c.Signed-off-by Maharaja Kennadyrajan <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
4c2da40244db ath11k: Removed MICHAEL_MIC_LEN and use IEEE80211_CCMP_MIC_LEN
Signature · 9 lines
https://patchwork.kernel.org/patch/10989369/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k