Parcourir la source

qcacld-3.0: Fix kernel checkpatch warnings in wlan_hdd_softap_tx_rx.c

Fix kernel checkpatch warnings in wlan_hdd_softap_tx_rx.c.

Change-Id: I816fb9b7df30e154eb348f88b7ebd0f75ba77fc3
CRs-Fixed: 2024274
Srinivas Girigowda il y a 8 ans
Parent
commit
e806a829e5
1 fichiers modifiés avec 10 ajouts et 18 suppressions
  1. 10 18
      core/hdd/src/wlan_hdd_softap_tx_rx.c

+ 10 - 18
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -68,8 +68,7 @@ static void hdd_softap_dump_sk_buff(struct sk_buff *skb)
 {
 	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: head = %p ", __func__, skb->head);
-	/* QDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */
-	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 		  "%s: tail = %p ", __func__, skb->tail);
 	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: end = %p ", __func__, skb->end);
@@ -118,7 +117,6 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context)
 	hdd_notice("Enabling queues");
 	wlan_hdd_netif_queue_control(pAdapter, WLAN_WAKE_ALL_NETIF_QUEUE,
 				     WLAN_CONTROL_PATH);
-	return;
 }
 
 #if defined(CONFIG_PER_VDEV_TX_DESC_POOL)
@@ -145,6 +143,7 @@ hdd_softap_tx_resume_false(hdd_adapter_t *pAdapter, bool tx_resume)
 			qdf_mc_timer_get_current_state(&pAdapter->
 						       tx_flow_control_timer)) {
 		QDF_STATUS status;
+
 		status = qdf_mc_timer_start(&pAdapter->tx_flow_control_timer,
 				WLAN_SAP_HDD_TX_FLOW_CONTROL_OS_Q_BLOCK_TIME);
 
@@ -153,14 +152,12 @@ hdd_softap_tx_resume_false(hdd_adapter_t *pAdapter, bool tx_resume)
 		else
 			pAdapter->hdd_stats.hddTxRxStats.txflow_timer_cnt++;
 	}
-	return;
 }
 #else
 
 static inline void
 hdd_softap_tx_resume_false(hdd_adapter_t *pAdapter, bool tx_resume)
 {
-	return;
 }
 #endif
 
@@ -196,8 +193,6 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume)
 					WLAN_DATA_FLOW_CONTROL);
 	}
 	hdd_softap_tx_resume_false(pAdapter, tx_resume);
-
-	return;
 }
 
 static inline struct sk_buff *hdd_skb_orphan(hdd_adapter_t *pAdapter,
@@ -205,9 +200,8 @@ static inline struct sk_buff *hdd_skb_orphan(hdd_adapter_t *pAdapter,
 {
 	if (pAdapter->tx_flow_low_watermark > 0)
 		skb_orphan(skb);
-	else {
+	else
 		skb = skb_unshare(skb, GFP_ATOMIC);
-	}
 
 	return skb;
 }
@@ -280,9 +274,8 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	 * SAP starts Tx only after the BSS START is
 	 * done.
 	 */
-	if (pHddApCtx->dfs_cac_block_tx) {
+	if (pHddApCtx->dfs_cac_block_tx)
 		goto drop_pkt;
-	}
 
 	/*
 	 * If a transmit function is not registered, drop packet
@@ -362,7 +355,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	ac = hdd_qdisc_ac_to_tl_ac[skb->queue_mapping];
 	++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
 
-#if defined (IPA_OFFLOAD)
+#if defined(IPA_OFFLOAD)
 	if (!qdf_nbuf_ipa_owned_get(skb)) {
 #endif
 
@@ -389,7 +382,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 		if (!skb)
 			goto drop_pkt_accounting;
 
-#if defined (IPA_OFFLOAD)
+#if defined(IPA_OFFLOAD)
 	}
 #endif
 
@@ -397,9 +390,8 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 
 	if (qdf_nbuf_is_tso(skb))
 		pAdapter->stats.tx_packets += qdf_nbuf_get_tso_num_seg(skb);
-	else {
+	else
 		++pAdapter->stats.tx_packets;
-	}
 
 	hdd_event_eapol_log(skb, QDF_TX);
 	qdf_dp_trace_log_pkt(pAdapter->sessionId, skb, QDF_TX);
@@ -765,11 +757,10 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 			rxstat = netif_receive_skb(skb);
 		else
 			rxstat = netif_rx_ni(skb);
-		if (NET_RX_SUCCESS == rxstat) {
+		if (NET_RX_SUCCESS == rxstat)
 			++pAdapter->hdd_stats.hddTxRxStats.rxDelivered[cpu_index];
-		} else {
+		else
 			++pAdapter->hdd_stats.hddTxRxStats.rxRefused[cpu_index];
-		}
 
 		pAdapter->dev->last_rx = jiffies;
 	}
@@ -999,6 +990,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 	uint8_t staId = 0;
 	hdd_context_t *pHddCtx;
+
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	/* bss deregister is not allowed during wlan driver loading or