git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2x00mac.c
diff --git
a/drivers/net/wireless/rt2x00/rt2x00mac.c
b/drivers/net/wireless/rt2x00/rt2x00mac.c
index
8efab39
..
4ccf238
100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00mac.c
@@
-113,7
+113,7
@@
void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
* due to possible race conditions in mac80211.
*/
if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
* due to possible race conditions in mac80211.
*/
if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
- goto exit_f
ail
;
+ goto exit_f
ree_skb
;
/*
* Use the ATIM queue if appropriate and present.
/*
* Use the ATIM queue if appropriate and present.
@@
-127,7
+127,7
@@
void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
ERROR(rt2x00dev,
"Attempt to send packet over invalid queue %d.\n"
"Please file bug report to %s.\n", qid, DRV_PROJECT);
ERROR(rt2x00dev,
"Attempt to send packet over invalid queue %d.\n"
"Please file bug report to %s.\n", qid, DRV_PROJECT);
- goto exit_f
ail
;
+ goto exit_f
ree_skb
;
}
/*
}
/*
@@
-159,6
+159,7
@@
void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
exit_fail:
rt2x00queue_pause_queue(queue);
exit_fail:
rt2x00queue_pause_queue(queue);
+ exit_free_skb:
dev_kfree_skb_any(skb);
}
EXPORT_SYMBOL_GPL(rt2x00mac_tx);
dev_kfree_skb_any(skb);
}
EXPORT_SYMBOL_GPL(rt2x00mac_tx);