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

Fix Datapath kernel checkpatch warnings in ol_tx_send.c

Change-Id: I94b3e093eac8d51524a689151028ef296cc4da82
CRs-Fixed: 2032874
This commit is contained in:
Yun Park
2017-04-08 13:29:34 -07:00
committed by snandini
parent 34adb051ad
commit f9677156d7

View File

@@ -107,13 +107,11 @@ ol_tx_target_credit_incr_int(struct ol_txrx_pdev_t *pdev, int delta)
static inline void static inline void
ol_tx_target_credit_decr_int(struct ol_txrx_pdev_t *pdev, int delta) ol_tx_target_credit_decr_int(struct ol_txrx_pdev_t *pdev, int delta)
{ {
return;
} }
static inline void static inline void
ol_tx_target_credit_incr_int(struct ol_txrx_pdev_t *pdev, int delta) ol_tx_target_credit_incr_int(struct ol_txrx_pdev_t *pdev, int delta)
{ {
return;
} }
#endif #endif
@@ -139,6 +137,7 @@ void ol_txrx_flow_control_cb(struct cdp_vdev *pvdev, bool tx_resume)
static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev) static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev)
{ {
struct ol_txrx_vdev_t *vdev; struct ol_txrx_vdev_t *vdev;
TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
if (qdf_atomic_read(&vdev->os_q_paused) && if (qdf_atomic_read(&vdev->os_q_paused) &&
(vdev->tx_fl_hwm != 0)) { (vdev->tx_fl_hwm != 0)) {
@@ -159,6 +158,7 @@ static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev)
static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev) static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev)
{ {
struct ol_txrx_vdev_t *vdev; struct ol_txrx_vdev_t *vdev;
TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
if (qdf_atomic_read(&vdev->os_q_paused) && if (qdf_atomic_read(&vdev->os_q_paused) &&
(vdev->tx_fl_hwm != 0)) { (vdev->tx_fl_hwm != 0)) {
@@ -181,7 +181,6 @@ static void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev)
static inline void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev) static inline void ol_tx_flow_ct_unpause_os_q(ol_txrx_pdev_handle pdev)
{ {
return;
} }
#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
@@ -254,6 +253,7 @@ ol_tx_send_batch(struct ol_txrx_pdev_t *pdev,
qdf_nbuf_t head_msdu, int num_msdus) qdf_nbuf_t head_msdu, int num_msdus)
{ {
qdf_nbuf_t rejected; qdf_nbuf_t rejected;
OL_TX_CREDIT_RECLAIM(pdev); OL_TX_CREDIT_RECLAIM(pdev);
rejected = htt_tx_send_batch(pdev->htt_pdev, head_msdu, num_msdus); rejected = htt_tx_send_batch(pdev->htt_pdev, head_msdu, num_msdus);
@@ -351,6 +351,7 @@ ol_tx_download_done_hl_retain(void *txrx_pdev,
qdf_nbuf_t msdu, uint16_t msdu_id) qdf_nbuf_t msdu, uint16_t msdu_id)
{ {
struct ol_txrx_pdev_t *pdev = txrx_pdev; struct ol_txrx_pdev_t *pdev = txrx_pdev;
ol_tx_download_done_base(pdev, status, msdu, msdu_id); ol_tx_download_done_base(pdev, status, msdu, msdu_id);
} }
@@ -401,7 +402,6 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
enum htt_tx_status status, enum htt_tx_status status,
uint16_t *desc_ids, int num_msdus) uint16_t *desc_ids, int num_msdus)
{ {
return;
} }
#endif /* QCA_COMPUTE_TX_DELAY */ #endif /* QCA_COMPUTE_TX_DELAY */
@@ -459,12 +459,12 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
#define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \ #define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \
_netbuf, _lcl_freelist, \ _netbuf, _lcl_freelist, \
_tx_desc_last, _status, is_tx_desc_freed) \ _tx_desc_last, _status, is_tx_desc_freed) \
do { \ { \
is_tx_desc_freed = 0; \ is_tx_desc_freed = 0; \
ol_tx_msdu_complete_single((_pdev), (_tx_desc), \ ol_tx_msdu_complete_single((_pdev), (_tx_desc), \
(_netbuf), (_lcl_freelist), \ (_netbuf), (_lcl_freelist), \
_tx_desc_last) \ _tx_desc_last) \
} while (0) }
#else /* !QCA_TX_STD_PATH_ONLY */ #else /* !QCA_TX_STD_PATH_ONLY */
#define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \ #define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \
_netbuf, _lcl_freelist, \ _netbuf, _lcl_freelist, \
@@ -488,11 +488,11 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
#define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \ #define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \
_netbuf, _lcl_freelist, \ _netbuf, _lcl_freelist, \
_tx_desc_last, _status, is_tx_desc_freed) \ _tx_desc_last, _status, is_tx_desc_freed) \
do { \ { \
is_tx_desc_freed = 0; \ is_tx_desc_freed = 0; \
ol_tx_msdu_complete_batch((_pdev), (_tx_desc), \ ol_tx_msdu_complete_batch((_pdev), (_tx_desc), \
(_tx_descs), (_status)) \ (_tx_descs), (_status)) \
} while (0) }
#else /* !QCA_TX_STD_PATH_ONLY */ #else /* !QCA_TX_STD_PATH_ONLY */
#define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \ #define ol_tx_msdu_complete(_pdev, _tx_desc, _tx_descs, \
_netbuf, _lcl_freelist, \ _netbuf, _lcl_freelist, \
@@ -539,8 +539,8 @@ void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev)
if (num_disarded) if (num_disarded)
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
"Warning: freed %d tx descs for which" "Warning: freed %d tx descs for which no tx completion rcvd from the target",
"no tx completion rcvd from the target", num_disarded); num_disarded);
} }
#endif #endif
@@ -555,11 +555,12 @@ void ol_tx_credit_completion_handler(ol_txrx_pdev_handle pdev, int credits)
ol_tx_flow_ct_unpause_os_q(pdev); ol_tx_flow_ct_unpause_os_q(pdev);
} }
/* WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of /**
ol_tx_completion_handler(). * WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of
* any change in ol_tx_completion_handler() must be mirrored in * ol_tx_completion_handler().
ol_tx_inspect_handler(). * any change in ol_tx_completion_handler() must be mirrored in
*/ * ol_tx_inspect_handler().
*/
void void
ol_tx_completion_handler(ol_txrx_pdev_handle pdev, ol_tx_completion_handler(ol_txrx_pdev_handle pdev,
int num_msdus, int num_msdus,
@@ -851,8 +852,9 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev,
} }
} }
/* WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of /**
ol_tx_completion_handler(). * WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of
* ol_tx_completion_handler().
* any change in ol_tx_completion_handler() must be mirrored here. * any change in ol_tx_completion_handler() must be mirrored here.
*/ */
void void
@@ -892,8 +894,9 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev,
if (qdf_atomic_dec_and_test(&tx_desc->ref_cnt)) if (qdf_atomic_dec_and_test(&tx_desc->ref_cnt))
#endif #endif
{ {
/* for this function only, force htt status to be /*
"htt_tx_status_ok" * For this function only, force htt status to be
* "htt_tx_status_ok"
* for graceful freeing of this multicast frame * for graceful freeing of this multicast frame
*/ */
ol_tx_msdu_complete(pdev, tx_desc, tx_descs, netbuf, ol_tx_msdu_complete(pdev, tx_desc, tx_descs, netbuf,
@@ -1053,6 +1056,7 @@ ol_tx_delay_hist(struct cdp_pdev *ppdev,
for (i = 0, j = 0; i < QCA_TX_DELAY_HIST_REPORT_BINS - 1; i++) { for (i = 0, j = 0; i < QCA_TX_DELAY_HIST_REPORT_BINS - 1; i++) {
uint16_t internal_bin_sum = 0; uint16_t internal_bin_sum = 0;
while (j < (1 << i)) while (j < (1 << i))
internal_bin_sum += data->hist_bins_queue[j++]; internal_bin_sum += data->hist_bins_queue[j++];
@@ -1090,12 +1094,14 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev,
if (pdev->frame_format == wlan_frm_fmt_802_3) { if (pdev->frame_format == wlan_frm_fmt_802_3) {
struct ethernet_hdr_t *enet_hdr; struct ethernet_hdr_t *enet_hdr;
enet_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu); enet_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu);
l2_hdr_size = sizeof(struct ethernet_hdr_t); l2_hdr_size = sizeof(struct ethernet_hdr_t);
ethertype = ethertype =
(enet_hdr->ethertype[0] << 8) | enet_hdr->ethertype[1]; (enet_hdr->ethertype[0] << 8) | enet_hdr->ethertype[1];
if (!IS_ETHERTYPE(ethertype)) { if (!IS_ETHERTYPE(ethertype)) {
struct llc_snap_hdr_t *llc_hdr; struct llc_snap_hdr_t *llc_hdr;
llc_hdr = (struct llc_snap_hdr_t *) llc_hdr = (struct llc_snap_hdr_t *)
(qdf_nbuf_data(msdu) + l2_hdr_size); (qdf_nbuf_data(msdu) + l2_hdr_size);
l2_hdr_size += sizeof(struct llc_snap_hdr_t); l2_hdr_size += sizeof(struct llc_snap_hdr_t);
@@ -1105,6 +1111,7 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev,
} }
} else { } else {
struct llc_snap_hdr_t *llc_hdr; struct llc_snap_hdr_t *llc_hdr;
l2_hdr_size = sizeof(struct ieee80211_frame); l2_hdr_size = sizeof(struct ieee80211_frame);
llc_hdr = (struct llc_snap_hdr_t *)(qdf_nbuf_data(msdu) llc_hdr = (struct llc_snap_hdr_t *)(qdf_nbuf_data(msdu)
+ l2_hdr_size); + l2_hdr_size);
@@ -1129,14 +1136,16 @@ static int ol_tx_delay_category(struct ol_txrx_pdev_t *pdev, uint16_t msdu_id)
#ifdef QCA_COMPUTE_TX_DELAY_PER_TID #ifdef QCA_COMPUTE_TX_DELAY_PER_TID
struct ol_tx_desc_t *tx_desc = ol_tx_desc_find(pdev, msdu_id); struct ol_tx_desc_t *tx_desc = ol_tx_desc_find(pdev, msdu_id);
uint8_t tid; uint8_t tid;
qdf_nbuf_t msdu = tx_desc->netbuf; qdf_nbuf_t msdu = tx_desc->netbuf;
tid = qdf_nbuf_get_tid(msdu); tid = qdf_nbuf_get_tid(msdu);
if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc); tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc);
if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
/* TID could not be determined /*
(this is not an IP frame?) */ * TID could not be determined
* (this is not an IP frame?)
*/
return -EINVAL; return -EINVAL;
} }
} }