change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/net/wireless/ath/carl9170/tx.c
..
..
@@ -246,8 +246,8 @@
246
246
 	 *    of available memory blocks, so the number can
247
247
 	 *    never execeed the mem_blocks count.
248
248
 	 */
249
-	if (unlikely(WARN_ON_ONCE(cookie == 0) ||
250
-	    WARN_ON_ONCE(cookie > ar->fw.mem_blocks)))
249
+	if (WARN_ON_ONCE(cookie == 0) ||
250
+	    WARN_ON_ONCE(cookie > ar->fw.mem_blocks))
251
251
 		return;
252
252
 
253
253
 	atomic_add(DIV_ROUND_UP(skb->len, ar->fw.mem_block_size),
..
..
@@ -663,7 +663,7 @@
663
663
 	unsigned int r, t, q;
664
664
 	bool success = true;
665
665
 
666
-	q = ar9170_qmap[info & CARL9170_TX_STATUS_QUEUE];
666
+	q = ar9170_qmap(info & CARL9170_TX_STATUS_QUEUE);
667
667
 
668
668
 	skb = carl9170_get_queued_skb(ar, cookie, &ar->tx_status[q]);
669
669
 	if (!skb) {
..
..
@@ -830,10 +830,12 @@
830
830
 	case CARL9170_ERP_AUTO:
831
831
 		if (ampdu)
832
832
 			break;
833
+		fallthrough;
833
834
 
834
835
 	case CARL9170_ERP_MAC80211:
835
836
 		if (!(rate->flags & IEEE80211_TX_RC_USE_RTS_CTS))
836
837
 			break;
838
+		fallthrough;
837
839
 
838
840
 	case CARL9170_ERP_RTS:
839
841
 		if (likely(!multi))
..
..
@@ -854,6 +856,7 @@
854
856
 	case CARL9170_ERP_MAC80211:
855
857
 		if (!(rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT))
856
858
 			break;
859
+		fallthrough;
857
860
 
858
861
 	case CARL9170_ERP_CTS:
859
862
 		return true;
..
..
@@ -976,7 +979,7 @@
976
979
 		((CARL9170_TX_SUPER_MISC_VIF_ID >>
977
980
 		 CARL9170_TX_SUPER_MISC_VIF_ID_S) + 1));
978
981
 
979
-	hw_queue = ar9170_qmap[carl9170_get_queue(ar, skb)];
982
+	hw_queue = ar9170_qmap(carl9170_get_queue(ar, skb));
980
983
 
981
984
 	hdr = (void *)skb->data;
982
985
 	info = IEEE80211_SKB_CB(skb);
..
..
@@ -1276,7 +1279,7 @@
1276
1279
 
1277
1280
 	super = (void *)skb->data;
1278
1281
 	SET_VAL(CARL9170_TX_SUPER_MISC_QUEUE, q,
1279
-		ar9170_qmap[carl9170_get_queue(ar, skb)]);
1282
+		ar9170_qmap(carl9170_get_queue(ar, skb)));
1280
1283
 	__carl9170_tx_process_status(ar, super->s.cookie, q);
1281
1284
 }
1282
1285
 
..
..
@@ -1554,6 +1557,9 @@
1554
1557
 					goto out;
1555
1558
 			}
1556
1559
 		} while (ar->beacon_enabled && i--);
1560
+
1561
+		/* no entry found in list */
1562
+		return NULL;
1557
1563
 	}
1558
1564
 
1559
1565
 out: