diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-01 13:43:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-01 13:43:25 -0500 |
commit | ed6882ac40552034ae6bde3e540b84c832dc8491 (patch) | |
tree | 989f14b7cee32d55f28b87c3610ffd41cefc8825 /drivers/net/wireless/rtlwifi | |
parent | 66555e92fb7a619188c02cceae4bbc414f15f96d (diff) | |
parent | 8a7d7cbf7b5ff9912ef50b3e94c9ad9f37b1c75f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index f2ecdeb3a90..1535efda3d5 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c @@ -542,8 +542,8 @@ static void _rtl_rx_pre_process(struct ieee80211_hw *hw, struct sk_buff *skb) WARN_ON(skb_queue_empty(&rx_queue)); while (!skb_queue_empty(&rx_queue)) { _skb = skb_dequeue(&rx_queue); - _rtl_usb_rx_process_agg(hw, skb); - ieee80211_rx_irqsafe(hw, skb); + _rtl_usb_rx_process_agg(hw, _skb); + ieee80211_rx_irqsafe(hw, _skb); } } |