Bläddra i källkod

qcacld-3.0: Fix Datapath kernel checkpatch warnings in ol_rx_defrag.c

Fix Datapath kernel checkpatch warnings in ol_rx_defrag.c

Change-Id: Iacf91e53cedf7908daa4d86525acc4d4f80969b0
CRs-Fixed: 2032874
Yun Park 8 år sedan
förälder
incheckning
63018127e4
1 ändrade filer med 12 tillägg och 11 borttagningar
  1. 12 11
      core/dp/txrx/ol_rx_defrag.c

+ 12 - 11
core/dp/txrx/ol_rx_defrag.c

@@ -279,7 +279,6 @@ ol_rx_frag_restructure(
 		int rx_desc_len)
 {
 	/* no op */
-	return;
 }
 
 static inline
@@ -389,7 +388,8 @@ ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev,
  */
 void
 ol_rx_reorder_flush_frag(htt_pdev_handle htt_pdev,
-			 struct ol_txrx_peer_t *peer, unsigned tid, int seq_num)
+			 struct ol_txrx_peer_t *peer,
+			 unsigned int tid, int seq_num)
 {
 	struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem;
 	int seq;
@@ -409,7 +409,7 @@ ol_rx_reorder_flush_frag(htt_pdev_handle htt_pdev,
 void
 ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev,
 			 struct ol_txrx_peer_t *peer,
-			 unsigned tid, uint16_t seq_num, qdf_nbuf_t frag)
+			 unsigned int tid, uint16_t seq_num, qdf_nbuf_t frag)
 {
 	struct ieee80211_frame *fmac_hdr, *mac_hdr;
 	uint8_t fragno, more_frag, all_frag_present = 0;
@@ -533,10 +533,10 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev,
 			htt_rx_desc_frame_free(htt_pdev, frag);
 			*all_frag_present = 0;
 			return;
-		} else {
-			qdf_nbuf_set_next(prev, frag);
-			qdf_nbuf_set_next(frag, cur);
 		}
+
+		qdf_nbuf_set_next(prev, frag);
+		qdf_nbuf_set_next(frag, cur);
 	}
 	next = qdf_nbuf_next(*head_addr);
 	lmac_hdr = (struct ieee80211_frame *)ol_rx_frag_get_mac_hdr(htt_pdev,
@@ -568,7 +568,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev,
 /*
  * add tid to pending fragment wait list
  */
-void ol_rx_defrag_waitlist_add(struct ol_txrx_peer_t *peer, unsigned tid)
+void ol_rx_defrag_waitlist_add(struct ol_txrx_peer_t *peer, unsigned int tid)
 {
 	struct ol_txrx_pdev_t *pdev = peer->vdev->pdev;
 	struct ol_rx_reorder_t *rx_reorder = &peer->tids_rx_reorder[tid];
@@ -580,7 +580,7 @@ void ol_rx_defrag_waitlist_add(struct ol_txrx_peer_t *peer, unsigned tid)
 /*
  * remove tid from pending fragment wait list
  */
-void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned tid)
+void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned int tid)
 {
 	struct ol_txrx_pdev_t *pdev = peer->vdev->pdev;
 	struct ol_rx_reorder_t *rx_reorder = &peer->tids_rx_reorder[tid];
@@ -616,7 +616,7 @@ void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev)
 			   defrag_waitlist_elem, tmp) {
 		struct ol_txrx_peer_t *peer;
 		struct ol_rx_reorder_t *rx_reorder_base;
-		unsigned tid;
+		unsigned int tid;
 
 		if (rx_reorder->defrag_timeout_ms > now_ms)
 			break;
@@ -639,7 +639,8 @@ void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev)
  */
 void
 ol_rx_defrag(ol_txrx_pdev_handle pdev,
-	     struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t frag_list)
+	     struct ol_txrx_peer_t *peer, unsigned int tid,
+	     qdf_nbuf_t frag_list)
 {
 	struct ol_txrx_vdev_t *vdev = NULL;
 	qdf_nbuf_t tmp_next, msdu, prev = NULL, cur = frag_list;
@@ -648,8 +649,8 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev,
 	void *rx_desc;
 	struct ieee80211_frame *wh;
 	uint8_t key[DEFRAG_IEEE80211_KEY_LEN];
-
 	htt_pdev_handle htt_pdev = pdev->htt_pdev;
+
 	vdev = peer->vdev;
 
 	/* bypass defrag for safe mode */