From 80a268fa37b72dc572980591702a62626a22bfd5 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 8 Nov 2011 13:04:41 +0100
Subject: [PATCH] --- yaml --- r: 275699 b: refs/heads/master c:
 5b2bbf75a24d6b06afff6de0eb4819413fd81971 h: refs/heads/master i:   275697:
 ace04f03ceeb579e2e432af75e0bee537b425bbb   275695:
 d423ffc0d319e43fc692087e54d6a18be5db4e1c v: v3

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

diff --git a/[refs] b/[refs]
index 46eb14db7976..bd983b637935 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8d1ccf15568268c76f913b45ecdd33134387f1a
+refs/heads/master: 5b2bbf75a24d6b06afff6de0eb4819413fd81971
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 7439d26bf5f9..0c9490722aa5 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -880,6 +880,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
 	skb = ieee80211_probereq_get(&local->hw, &sdata->vif,
 				     ssid, ssid_len,
 				     buf, buf_len);
+	if (!skb)
+		goto out;
 
 	if (dst) {
 		mgmt = (struct ieee80211_mgmt *) skb->data;
@@ -888,6 +890,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
 	}
 
 	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+
+ out:
 	kfree(buf);
 
 	return skb;