Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[deliverable/linux.git] / drivers / net / wireless / rtlwifi / rtl8192cu / trx.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index f0dada530153c26053c8bb7584d48d99467cda37..763cf1defab5b4027b22604c3771e4c8465a4405 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -434,7 +434,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
                 (u32)hdr->addr1[2], (u32)hdr->addr1[3],
                 (u32)hdr->addr1[4], (u32)hdr->addr1[5]);
        memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status));
-       ieee80211_rx_irqsafe(hw, skb);
+       ieee80211_rx(hw, skb);
 }
 
 void  rtl8192cu_rx_hdl(struct ieee80211_hw *hw, struct sk_buff * skb)