forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/net/wireless/ath/carl9170/tx.c
....@@ -246,8 +246,8 @@
246246 	 *    of available memory blocks, so the number can
247247 	 *    never execeed the mem_blocks count.
248248 	 */
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))
251251 		return;
252252 
253253 	atomic_add(DIV_ROUND_UP(skb->len, ar->fw.mem_block_size),
....@@ -663,7 +663,7 @@
663663 	unsigned int r, t, q;
664664 	bool success = true;
665665 
666
-	q = ar9170_qmap[info & CARL9170_TX_STATUS_QUEUE];
666
+	q = ar9170_qmap(info & CARL9170_TX_STATUS_QUEUE);
667667 
668668 	skb = carl9170_get_queued_skb(ar, cookie, &ar->tx_status[q]);
669669 	if (!skb) {
....@@ -830,10 +830,12 @@
830830 	case CARL9170_ERP_AUTO:
831831 		if (ampdu)
832832 			break;
833
+		fallthrough;
833834 
834835 	case CARL9170_ERP_MAC80211:
835836 		if (!(rate->flags & IEEE80211_TX_RC_USE_RTS_CTS))
836837 			break;
838
+		fallthrough;
837839 
838840 	case CARL9170_ERP_RTS:
839841 		if (likely(!multi))
....@@ -854,6 +856,7 @@
854856 	case CARL9170_ERP_MAC80211:
855857 		if (!(rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT))
856858 			break;
859
+		fallthrough;
857860 
858861 	case CARL9170_ERP_CTS:
859862 		return true;
....@@ -976,7 +979,7 @@
976979 		((CARL9170_TX_SUPER_MISC_VIF_ID >>
977980 		 CARL9170_TX_SUPER_MISC_VIF_ID_S) + 1));
978981 
979
-	hw_queue = ar9170_qmap[carl9170_get_queue(ar, skb)];
982
+	hw_queue = ar9170_qmap(carl9170_get_queue(ar, skb));
980983 
981984 	hdr = (void *)skb->data;
982985 	info = IEEE80211_SKB_CB(skb);
....@@ -1276,7 +1279,7 @@
12761279 
12771280 	super = (void *)skb->data;
12781281 	SET_VAL(CARL9170_TX_SUPER_MISC_QUEUE, q,
1279
-		ar9170_qmap[carl9170_get_queue(ar, skb)]);
1282
+		ar9170_qmap(carl9170_get_queue(ar, skb)));
12801283 	__carl9170_tx_process_status(ar, super->s.cookie, q);
12811284 }
12821285 
....@@ -1554,6 +1557,9 @@
15541557 					goto out;
15551558 			}
15561559 		} while (ar->beacon_enabled && i--);
1560
+
1561
+		/* no entry found in list */
1562
+		return NULL;
15571563 	}
15581564 
15591565 out: