Skip to content

Commit

Permalink
rtlwifi: Free skb in one place
Browse files Browse the repository at this point in the history
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Mike McCormack authored and John W. Linville committed Jun 10, 2011
1 parent 8db8ddf commit 14058ad
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/wireless/rtlwifi/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,19 +727,16 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
(rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) &&
(ieee80211_is_beacon(fc) ||
ieee80211_is_probe_resp(fc))) {
dev_kfree_skb_any(skb);
;
} else {
if (unlikely(!rtl_action_proc(hw, skb, false))) {
dev_kfree_skb_any(skb);
} else {
if (likely(rtl_action_proc(hw, skb, false))) {
struct sk_buff *uskb = NULL;
u8 *pdata;
uskb = dev_alloc_skb(skb->len + 128);
memcpy(IEEE80211_SKB_RXCB(uskb),
&rx_status, sizeof(rx_status));
pdata = (u8 *)skb_put(uskb, skb->len);
memcpy(pdata, skb->data, skb->len);
dev_kfree_skb_any(skb);

ieee80211_rx_irqsafe(hw, uskb);
}
Expand All @@ -751,6 +748,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
}

dev_kfree_skb_any(skb);
skb = new_skb;

rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;
Expand Down

0 comments on commit 14058ad

Please sign in to comment.