Skip to content

Commit

Permalink
mwifiex: Remove redundant skb_queue_empty checks
Browse files Browse the repository at this point in the history
The check of skb list empty before calling skb_peek and skb_dequeue is
redundant. These functions returns NULL if the list is empty.

Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Yogesh Ashok Powar authored and John W. Linville committed Jun 7, 2011
1 parent fcf2176 commit a8fe329
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/net/wireless/mwifiex/11n_aggr.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,13 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
struct mwifiex_tx_param tx_param;
struct txpd *ptx_pd = NULL;

if (skb_queue_empty(&pra_list->skb_head)) {
skb_src = skb_peek(&pra_list->skb_head);
if (!skb_src) {
spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
ra_list_flags);
return 0;
}
skb_src = skb_peek(&pra_list->skb_head);

tx_info_src = MWIFIEX_SKB_TXCB(skb_src);
skb_aggr = dev_alloc_skb(adapter->tx_buf_size);
if (!skb_aggr) {
Expand All @@ -188,10 +189,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
+ LLC_SNAP_LEN)
<= adapter->tx_buf_size)) {

if (!skb_queue_empty(&pra_list->skb_head))
skb_src = skb_dequeue(&pra_list->skb_head);
else
skb_src = NULL;
skb_src = skb_dequeue(&pra_list->skb_head);

if (skb_src) {
pra_list->total_pkts_size -= skb_src->len;
Expand All @@ -214,10 +212,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
return -1;
}

if (!skb_queue_empty(&pra_list->skb_head))
skb_src = skb_peek(&pra_list->skb_head);
else
skb_src = NULL;
skb_src = skb_peek(&pra_list->skb_head);
}

spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
Expand Down

0 comments on commit a8fe329

Please sign in to comment.