Re: [PATCH] rt61pci: rt61pci_beacon_update do not free skb twice

[Ivo van Doorn <ivdoorn@gmail.com>]

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