Commit a8fe3293 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville

mwifiex: Remove redundant skb_queue_empty checks

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: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fcf2176c
...@@ -164,12 +164,13 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, ...@@ -164,12 +164,13 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
struct mwifiex_tx_param tx_param; struct mwifiex_tx_param tx_param;
struct txpd *ptx_pd = NULL; 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, spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
ra_list_flags); ra_list_flags);
return 0; return 0;
} }
skb_src = skb_peek(&pra_list->skb_head);
tx_info_src = MWIFIEX_SKB_TXCB(skb_src); tx_info_src = MWIFIEX_SKB_TXCB(skb_src);
skb_aggr = dev_alloc_skb(adapter->tx_buf_size); skb_aggr = dev_alloc_skb(adapter->tx_buf_size);
if (!skb_aggr) { if (!skb_aggr) {
...@@ -188,10 +189,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, ...@@ -188,10 +189,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
+ LLC_SNAP_LEN) + LLC_SNAP_LEN)
<= adapter->tx_buf_size)) { <= adapter->tx_buf_size)) {
if (!skb_queue_empty(&pra_list->skb_head)) skb_src = skb_dequeue(&pra_list->skb_head);
skb_src = skb_dequeue(&pra_list->skb_head);
else
skb_src = NULL;
if (skb_src) { if (skb_src) {
pra_list->total_pkts_size -= skb_src->len; pra_list->total_pkts_size -= skb_src->len;
...@@ -214,10 +212,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, ...@@ -214,10 +212,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
return -1; return -1;
} }
if (!skb_queue_empty(&pra_list->skb_head)) skb_src = skb_peek(&pra_list->skb_head);
skb_src = skb_peek(&pra_list->skb_head);
else
skb_src = NULL;
} }
spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags); spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment