diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-11-29 07:00:10 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-30 07:41:27 -0500 |
commit | b9a9ada14aab17f08c1d9735601f1097cdcfc6de (patch) | |
tree | 47d823b696f262c53d5f52ef60bfb143b8444fa0 /drivers/net/wireless/mac80211_hwsim.c | |
parent | c604b9f219422e969fe371cc7259de34c3c5601d (diff) |
mac80211: remove probe response temporary buffer allocation
Instead of allocating a temporary buffer to build IEs
build them right into the SKB.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 2aa8a1aa1184..8a61dbd320e6 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -1347,9 +1347,14 @@ static void hw_scan_work(struct work_struct *work) | |||
1347 | hwsim->hw_scan_vif, | 1347 | hwsim->hw_scan_vif, |
1348 | req->ssids[i].ssid, | 1348 | req->ssids[i].ssid, |
1349 | req->ssids[i].ssid_len, | 1349 | req->ssids[i].ssid_len, |
1350 | req->ie, req->ie_len); | 1350 | req->ie_len); |
1351 | if (!probe) | 1351 | if (!probe) |
1352 | continue; | 1352 | continue; |
1353 | |||
1354 | if (req->ie_len) | ||
1355 | memcpy(skb_put(probe, req->ie_len), req->ie, | ||
1356 | req->ie_len); | ||
1357 | |||
1353 | local_bh_disable(); | 1358 | local_bh_disable(); |
1354 | mac80211_hwsim_tx_frame(hwsim->hw, probe, | 1359 | mac80211_hwsim_tx_frame(hwsim->hw, probe, |
1355 | hwsim->tmp_chan); | 1360 | hwsim->tmp_chan); |