From b386799d2eaa31bb1b68a0c9e1f9390c30fe1069 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
Date: Wed, 14 Dec 2011 13:33:30 +0100
Subject: [PATCH] --- yaml --- r: 278957 b: refs/heads/master c:
 cb71b8d80334add8991862f9fd36dc50874944ce h: refs/heads/master i:   278955:
 00c01cbd8f5582559890dc101760b1b22f229c52 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/ibss.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0bad0d7cfe57..5dc69dc8203c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38c9d6641ff0664911aebe4ba67124f28169a972
+refs/heads/master: cb71b8d80334add8991862f9fd36dc50874944ce
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 0fc9752facea..fe0e91e0b8bc 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -995,6 +995,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 		if (!ieee80211_set_channel_type(sdata->local, sdata,
 					       params->channel_type)) {
 			mutex_unlock(&sdata->u.ibss.mtx);
+			kfree_skb(skb);
 			return -EINVAL;
 		}
 	}