diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-11 11:34:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 11:34:47 -0500 |
| commit | fb14ca438c0a54306419ee648d9d146c5e7be679 (patch) | |
| tree | 5a4a434461fceb2586a250e702838264431c7f3d /net/mac80211/util.c | |
| parent | 1e49570171117e547e6324c58371db4a0dc2f1db (diff) | |
| parent | fada10584d3890258e59da73728510ad7e08a033 (diff) | |
| download | talos-op-linux-fb14ca438c0a54306419ee648d9d146c5e7be679.tar.gz talos-op-linux-fb14ca438c0a54306419ee648d9d146c5e7be679.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 51e256c5fb78..eca0fad09709 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -881,6 +881,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; @@ -889,6 +891,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; |
