git.openwrt.org Git - openwrt/staging/blogic.git/blob

   1 From 41e02bf4ae32cf2ac47b08b4caaa9c1a032e4ce7 Mon Sep 17 00:00:00 2001
   2 From: Harshitha Prem <quic_hprem@quicinc.com>
   3 Date: Tue, 4 Apr 2023 00:11:55 +0530
   4 Subject: [PATCH] wifi: ath11k: fix undefined behavior with __fls in dp
   5
   6 "__fls" would have an undefined behavior if the argument is passed
   7 as "0". Hence, added changes to handle the same.
   8
   9 Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
  10
  11 Signed-off-by: Harshitha Prem <quic_hprem@quicinc.com>
  12 Signed-off-by: Nagarajan Maran <quic_nmaran@quicinc.com>
  13 Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
  14 Link: https://lore.kernel.org/r/20230403184155.8670-3-quic_nmaran@quicinc.com
  15 ---
  16  drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
  17  1 file changed, 1 insertion(+), 1 deletion(-)
  18
  19 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c
  20 +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
  21 @@ -3598,7 +3598,7 @@ static int ath11k_dp_rx_frag_h_mpdu(stru
  22                 goto out_unlock;
  23         }
  24
  25 -       if (frag_no > __fls(rx_tid->rx_frag_bitmap))
  26 +       if (!rx_tid->rx_frag_bitmap || (frag_no > __fls(rx_tid->rx_frag_bitmap)))
  27                 __skb_queue_tail(&rx_tid->rx_frags, msdu);
  28         else
  29                 ath11k_dp_rx_h_sort_frags(ar, &rx_tid->rx_frags, msdu);