mac80211: split ieee80211_send_probe_req()

This function is passed many more parameters in the scan case
than in the MLME case, and differentiates the two cases inside.
Split it up and make both versions static to simplify things.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

1 files changed, 17 insertions, 5 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c3f2883cc0ec..a44e5b4aaeda 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2219,6 +2219,20 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
                 ieee80211_sta_reset_conn_monitor(sdata);
 }
 
+static void ieee80211_mlme_send_probe_req(struct ieee80211_sub_if_data *sdata,
+                                          const u8 *src, const u8 *dst,
+                                          const u8 *ssid, size_t ssid_len,
+                                          struct ieee80211_channel *channel)
+{
+        struct sk_buff *skb;
+
+        skb = ieee80211_build_probe_req(sdata, src, dst, (u32)-1, channel,
+                                        ssid, ssid_len, NULL, 0,
+                                        IEEE80211_PROBE_FLAG_DIRECTED);
+        if (skb)
+                ieee80211_tx_skb(sdata, skb);
+}
+
 static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -2265,11 +2279,9 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
                 else
                         ssid_len = ssid[1];
 
-                ieee80211_send_probe_req(sdata, sdata->vif.addr, dst,
-                                         ssid + 2, ssid_len, NULL,
-                                         0, (u32) -1,
-                                         IEEE80211_PROBE_FLAG_DIRECTED, 0,
-                                         ifmgd->associated->channel, false);
+                ieee80211_mlme_send_probe_req(sdata, sdata->vif.addr, dst,
+                                              ssid + 2, ssid_len,
+                                              ifmgd->associated->channel);
                 rcu_read_unlock();
         }