From b798dc619089f63e69bcc68171283052b86c1049 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 9 Apr 2008 16:29:01 +0200 Subject: [PATCH] --- yaml --- r: 88267 b: refs/heads/master c: e91e9d490d9ae382003ef9d05fd50238db54c35b h: refs/heads/master i: 88265: aacc7243e071f42b33bb277b63fb455c286412a2 88263: 82e09333932885572c106f2afdfd2c1ced8e27e4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt61pci.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b9e3f162fcf7..f9f2f147fe93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2633da237ba29875294f8680ebece5900ccdcc05 +refs/heads/master: e91e9d490d9ae382003ef9d05fd50238db54c35b diff --git a/trunk/drivers/net/wireless/rt2x00/rt61pci.c b/trunk/drivers/net/wireless/rt2x00/rt61pci.c index 93ea212fedd5..ad2e7d53b3da 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt61pci.c +++ b/trunk/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; - } } /*