diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-29 16:41:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-29 16:41:36 -0400 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /drivers/net/wireless/rtlwifi | |
| parent | 689b66cb53fbb5d567aa4e095eaa828aff73aef0 (diff) | |
| parent | 2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index 72c2614213c4..83915dcd0e58 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c | |||
| @@ -932,6 +932,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
| 932 | if (unlikely(!_urb)) { | 932 | if (unlikely(!_urb)) { |
| 933 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 933 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
| 934 | "Can't allocate urb. Drop skb!\n"); | 934 | "Can't allocate urb. Drop skb!\n"); |
| 935 | kfree_skb(skb); | ||
| 935 | return; | 936 | return; |
| 936 | } | 937 | } |
| 937 | _rtl_submit_tx_urb(hw, _urb); | 938 | _rtl_submit_tx_urb(hw, _urb); |