diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:16:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:16:12 +0100 |
| commit | e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38 (patch) | |
| tree | d77b0c7f1f8890fb75098c550277fe9b81c340b3 /drivers/net/wireless/rtlwifi/usb.c | |
| parent | 36eed56a8f7e1bd7fb5014ea0e702708e1702f30 (diff) | |
| parent | 9e97d14b4923da524d202f2e005d5d30b70db9d6 (diff) | |
| download | talos-op-linux-e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38.tar.gz talos-op-linux-e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.c')
| -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 80730c72e0d6..476eaef5e4a9 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); } } |
