From a263fa230dd77084048e0500e7e27953abd9ad12 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Fri, 21 Jan 2011 13:40:54 -0600 Subject: [PATCH] --- yaml --- r: 232479 b: refs/heads/master c: bdc4bf652bc0271ba8f1f25bbd3dbac90bead44e h: refs/heads/master i: 232477: d977f03790f5211ad1c9574f0d3c88fce020e0a5 232475: d5b12c1eaf53d5b8f41c156364c15f9c1f23e525 232471: 5d6ee75bdbc07ebda8710137f48551b58f01442e 232463: 28b10c4f64f40d6019f2aec67c7e1437bc7919fc 232447: c9e3efae039dad850c8117e4999ba1bb8fc467e6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtlwifi/pci.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fe5ab1a26fe5..c30909d3b8bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 783cd01e140d9db5c2d2279a96b81e16f9d81fef +refs/heads/master: bdc4bf652bc0271ba8f1f25bbd3dbac90bead44e diff --git a/trunk/drivers/net/wireless/rtlwifi/pci.c b/trunk/drivers/net/wireless/rtlwifi/pci.c index 0fa36aa6701a..1758d4463247 100644 --- a/trunk/drivers/net/wireless/rtlwifi/pci.c +++ b/trunk/drivers/net/wireless/rtlwifi/pci.c @@ -619,6 +619,13 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) struct sk_buff *uskb = NULL; u8 *pdata; uskb = dev_alloc_skb(skb->len + 128); + if (!uskb) { + RT_TRACE(rtlpriv, + (COMP_INTR | COMP_RECV), + DBG_EMERG, + ("can't alloc rx skb\n")); + goto done; + } memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status, sizeof(rx_status)); @@ -641,7 +648,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) new_skb = dev_alloc_skb(rtlpci->rxbuffersize); if (unlikely(!new_skb)) { RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV), - DBG_DMESG, + DBG_EMERG, ("can't alloc skb for rx\n")); goto done; } @@ -1066,9 +1073,9 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) struct sk_buff *skb = dev_alloc_skb(rtlpci->rxbuffersize); u32 bufferaddress; - entry = &rtlpci->rx_ring[rx_queue_idx].desc[i]; if (!skb) return 0; + entry = &rtlpci->rx_ring[rx_queue_idx].desc[i]; /*skb->dev = dev; */