diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-08 09:33:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-08 09:33:34 -0700 |
| commit | 3f97fae9482dac1dbdd870a25c89033d3a0b35dc (patch) | |
| tree | c98fb21da14bf22ab7ea23098945e31bef6558fc /net/mac80211/scan.c | |
| parent | 06b8fc5d308b15e853a68c3d4854fb2ac33db867 (diff) | |
| parent | 8a98d935c4b8b3515d1403d150e282f95b9f558d (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 58ffa7d069c..669d2e32efb 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -877,7 +877,8 @@ int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, for (i = 0; i < IEEE80211_NUM_BANDS; i++) { local->sched_scan_ies.ie[i] = kzalloc(2 + IEEE80211_MAX_SSID_LEN + - local->scan_ies_len, + local->scan_ies_len + + req->ie_len, GFP_KERNEL); if (!local->sched_scan_ies.ie[i]) { ret = -ENOMEM; |