Skip to content

Commit

Permalink
rsi: Fixed warnings reported by static code analyzers.
Browse files Browse the repository at this point in the history
Fixed a warning related to incorrect return type and removed an
unnecessary semi colon.

Signed-off-by: Jahnavi Meher <jahnavi.meher@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Jahnavi Meher authored and John W. Linville committed Jun 25, 2014
1 parent 688df7e commit d51193d
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/net/wireless/rsi/rsi_91x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ static u32 rsi_get_num_pkts_dequeue(struct rsi_common *common, u8 q_num)
struct sk_buff *skb;
u32 pkt_cnt = 0;
s16 txop = common->tx_qinfo[q_num].txop * 32;
__le16 r_txop;
struct ieee80211_rate rate;

rate.bitrate = RSI_RATE_MCS0 * 5 * 10; /* Convert to Kbps */
Expand All @@ -104,10 +105,11 @@ static u32 rsi_get_num_pkts_dequeue(struct rsi_common *common, u8 q_num)
return 0;

do {
txop -= ieee80211_generic_frame_duration(adapter->hw,
adapter->vifs[0],
common->band,
skb->len, &rate);
r_txop = ieee80211_generic_frame_duration(adapter->hw,
adapter->vifs[0],
common->band,
skb->len, &rate);
txop -= le16_to_cpu(r_txop);
pkt_cnt += 1;
/*checking if pkts are still there*/
if (skb_queue_len(&common->tx_queue[q_num]) - pkt_cnt)
Expand Down Expand Up @@ -191,7 +193,7 @@ static u8 rsi_core_determine_hal_queue(struct rsi_common *common)
if (q_num == VO_Q || q_num == VI_Q) {
common->pkt_cnt = rsi_get_num_pkts_dequeue(common, q_num);
common->pkt_cnt -= 1;
};
}

return q_num;
}
Expand Down

0 comments on commit d51193d

Please sign in to comment.