linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ivo van Doorn <ivdoorn@gmail.com>
To: Daniel Wagner <wagi@monom.org>
Cc: linux-wireless@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>
Subject: Re: [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice
Date: Wed, 9 Apr 2008 17:47:49 +0200	[thread overview]
Message-ID: <200804091747.50724.IvDoorn@gmail.com> (raw)
In-Reply-To: <1207751341-27611-1-git-send-email-wagi@monom.org>

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;
> -		}
>  	}
>  
>  	/*



  reply	other threads:[~2008-04-09 15:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2008-04-10  6:38   ` Daniel Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200804091747.50724.IvDoorn@gmail.com \
    --to=ivdoorn@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=wagi@monom.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).