* [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice
@ 2008-04-09 14:29 Daniel Wagner
2008-04-09 15:47 ` Ivo van Doorn
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Wagner @ 2008-04-09 14:29 UTC (permalink / raw)
To: linux-wireless; +Cc: Daniel Wagner
The layer above will free the skb in an error case.
Signed-off-by: Daniel Wagner <wagi@monom.org>
---
drivers/net/wireless/rt2x00/rt61pci.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 1cb056b..468a31c 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2379,10 +2379,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
*/
if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
- 0, GFP_ATOMIC)) {
- dev_kfree_skb(skb);
+ 0, GFP_ATOMIC))
return -ENOMEM;
- }
}
/*
--
1.5.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice
2008-04-09 14:29 [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice Daniel Wagner
@ 2008-04-09 15:47 ` Ivo van Doorn
2008-04-10 6:38 ` Daniel Wagner
0 siblings, 1 reply; 3+ messages in thread
From: Ivo van Doorn @ 2008-04-09 15:47 UTC (permalink / raw)
To: Daniel Wagner; +Cc: linux-wireless, John W. Linville
On Wednesday 09 April 2008, Daniel Wagner wrote:
> The layer above will free the skb in an error case.
>
> Signed-off-by: Daniel Wagner <wagi@monom.org>
Daniel: Please CC me for rt2x00 related patches.
John: Please queue this for 2.6.25 as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt61pci.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
> index 1cb056b..468a31c 100644
> --- a/drivers/net/wireless/rt2x00/rt61pci.c
> +++ b/drivers/net/wireless/rt2x00/rt61pci.c
> @@ -2379,10 +2379,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
> */
> if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
> if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
> - 0, GFP_ATOMIC)) {
> - dev_kfree_skb(skb);
> + 0, GFP_ATOMIC))
> return -ENOMEM;
> - }
> }
>
> /*
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-04-10 6:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-09 14:29 [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice Daniel Wagner
2008-04-09 15:47 ` Ivo van Doorn
2008-04-10 6:38 ` Daniel Wagner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).