Skip to content

Commit 6a23d5a

Browse files
committed
ath11k_nss: fix NULL pointer dereference when running without NSS
Adds in missing callbacks for `rx_desc_get_ip_valid` in IPQ8074, IPQ6018 and QCN9074. This was preventing running in non-NSS mode. Signed-off-by: Sean Khan <[email protected]>
1 parent 3bb14ba commit 6a23d5a

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,22 @@ Signed-off-by: P Praneesh <[email protected]>
397397
static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc)
398398
{
399399
return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID,
400+
@@ -943,6 +963,7 @@ const struct ath11k_hw_ops ipq8074_ops =
401+
.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,
402+
.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,
403+
.rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl,
404+
+ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid,
405+
.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,
406+
.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,
407+
.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,
408+
@@ -984,6 +1005,7 @@ const struct ath11k_hw_ops ipq6018_ops =
409+
.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,
410+
.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,
411+
.rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl,
412+
+ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid,
413+
.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,
414+
.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,
415+
.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,
400416
@@ -1025,6 +1045,7 @@ const struct ath11k_hw_ops qca6390_ops =
401417
.rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type,
402418
.rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type,
@@ -405,6 +421,14 @@ Signed-off-by: P Praneesh <[email protected]>
405421
.rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support,
406422
.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld,
407423
.rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid,
424+
@@ -1066,6 +1089,7 @@ const struct ath11k_hw_ops qcn9074_ops =
425+
.rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type,
426+
.rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type,
427+
.rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl,
428+
+ .rx_desc_get_ip_valid = ath11k_hw_qcn9074_rx_desc_get_ip_valid,
429+
.rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support,
430+
.rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld,
431+
.rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid,
408432
@@ -1189,6 +1210,7 @@ const struct ath11k_hw_ops ipq5018_ops =
409433
.rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type,
410434
.rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type,
@@ -440,3 +464,4 @@ Signed-off-by: P Praneesh <[email protected]>
440464
spin_lock_bh(&ar->ab->base_lock);
441465

442466
peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr);
467+

0 commit comments

Comments
 (0)