diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-06 23:58:41 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 23:58:41 +0400 |
| commit | 403e16731ffddc097eae89f53f9a7b0f0c9769c4 (patch) | |
| tree | 228d17985ad8ea22a7763457bf9641eb44781568 /drivers/net/wireless/mac80211_hwsim.c | |
| parent | 55cb0797fa779e36f62876a8aa44cbf3984e8d59 (diff) | |
| parent | da29d2a5780d80857773d7776b7603a449b0b6e0 (diff) | |
| download | linux-403e16731ffddc097eae89f53f9a7b0f0c9769c4.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
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) hwsim->hw_scan_vif, req->ssids[i].ssid, req->ssids[i].ssid_len, - req->ie, req->ie_len); + req->ie_len); if (!probe) continue; + + if (req->ie_len) + memcpy(skb_put(probe, req->ie_len), req->ie, + req->ie_len); + local_bh_disable(); mac80211_hwsim_tx_frame(hwsim->hw, probe, hwsim->tmp_chan); |