leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtlwifi: Free skb in one place

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Mike McCormack 2011-06-06 23:12:53 +09:00 committed by John W. Linville
parent 8db8ddf13d
commit 14058adddd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/rtlwifi/pci.c
View File

@ -727,11 +727,9 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
(rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) && (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) &&
(ieee80211_is_beacon(fc) || (ieee80211_is_beacon(fc) ||
ieee80211_is_probe_resp(fc))) { ieee80211_is_probe_resp(fc))) {
dev_kfree_skb_any(skb); ;
} else { } else {
if (unlikely(!rtl_action_proc(hw, skb, false))) { if (likely(rtl_action_proc(hw, skb, false))) {
dev_kfree_skb_any(skb);
} else {
struct sk_buff *uskb = NULL; struct sk_buff *uskb = NULL;
u8 *pdata; u8 *pdata;
uskb = dev_alloc_skb(skb->len + 128); uskb = dev_alloc_skb(skb->len + 128);
@ -739,7 +737,6 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
&rx_status, sizeof(rx_status)); &rx_status, sizeof(rx_status));
pdata = (u8 *)skb_put(uskb, skb->len); pdata = (u8 *)skb_put(uskb, skb->len);
memcpy(pdata, skb->data, skb->len); memcpy(pdata, skb->data, skb->len);
dev_kfree_skb_any(skb);
ieee80211_rx_irqsafe(hw, uskb); ieee80211_rx_irqsafe(hw, uskb);
} }
@ -751,6 +748,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
tasklet_schedule(&rtlpriv->works.ips_leave_tasklet); tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
} }
dev_kfree_skb_any(skb);
skb = new_skb; skb = new_skb;
rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb; rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;