OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2633da2
)
rt61pci: rt61pci_beacon_update do not free skb twice
author
Daniel Wagner
<wagi@monom.org>
Wed, 9 Apr 2008 14:29:01 +0000
(16:29 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 9 Apr 2008 19:02:23 +0000
(15:02 -0400)
The layer above will free the skb in an error case.
Signed-off-by: Daniel Wagner <wagi@monom.org>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt61pci.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/rt2x00/rt61pci.c
b/drivers/net/wireless/rt2x00/rt61pci.c
index
93ea212
..
ad2e7d5
100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt61pci.c
+++ b/
drivers/net/wireless/rt2x00/rt61pci.c
@@
-2399,10
+2399,8
@@
static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
* beacon frame.
*/
if (skb_headroom(skb) < TXD_DESC_SIZE) {
- if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) {
- dev_kfree_skb(skb);
+ if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC))
return -ENOMEM;
- }
}
/*