nl80211: Optional IEs into scan request

This extends the NL80211_CMD_TRIGGER_SCAN command to allow applications
to specify a set of information element(s) to be added into Probe
Request frames with NL80211_ATTR_IE. This provides support for the
MLME-SCAN.request primitive parameter VendorSpecificInfo and can be
used, e.g., to implement WPS scanning.

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ec5a0900cba0..5a4977936f6f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -716,7 +716,7 @@ static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata)
          * will not answer to direct packet in unassociated state.
          */
         ieee80211_send_probe_req(sdata, NULL,
-                                 ifmgd->ssid, ifmgd->ssid_len);
+                                 ifmgd->ssid, ifmgd->ssid_len, NULL, 0);
 
         mod_timer(&ifmgd->timer, jiffies + IEEE80211_AUTH_TIMEOUT);
 }
@@ -946,7 +946,8 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata)
                         } else
                                 ieee80211_send_probe_req(sdata, ifmgd->bssid,
                                                          ifmgd->ssid,
-                                                         ifmgd->ssid_len);
+                                                         ifmgd->ssid_len,
+                                                         NULL, 0);
                         ifmgd->flags ^= IEEE80211_STA_PROBEREQ_POLL;
                 } else {
                         ifmgd->flags &= ~IEEE80211_STA_PROBEREQ_POLL;
@@ -955,7 +956,8 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata)
                                 ifmgd->last_probe = jiffies;
                                 ieee80211_send_probe_req(sdata, ifmgd->bssid,
                                                          ifmgd->ssid,
-                                                         ifmgd->ssid_len);
+                                                         ifmgd->ssid_len,
+                                                         NULL, 0);
                         }
                 }
         }