Merge tag 'mac80211-next-for-davem-2018-12-19' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 818aa00..de65fe3 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -800,8 +800,8 @@ static int ieee80211_set_ftm_responder_params(
        u8 *pos;
        int len;
 
-       if ((!lci || !lci_len) && (!civicloc || !civicloc_len))
-               return 1;
+       if (!lci_len && !civicloc_len)
+               return 0;
 
        bss_conf = &sdata->vif.bss_conf;
        old = bss_conf->ftmr_params;
@@ -2028,6 +2028,9 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                        nconf->dot11MeshAwakeWindowDuration;
        if (_chg_mesh_attr(NL80211_MESHCONF_PLINK_TIMEOUT, mask))
                conf->plink_timeout = nconf->plink_timeout;
+       if (_chg_mesh_attr(NL80211_MESHCONF_CONNECTED_TO_GATE, mask))
+               conf->dot11MeshConnectedToMeshGate =
+                       nconf->dot11MeshConnectedToMeshGate;
        ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON);
        return 0;
 }
@@ -3850,6 +3853,26 @@ ieee80211_get_ftm_responder_stats(struct wiphy *wiphy,
        return drv_get_ftm_responder_stats(local, sdata, ftm_stats);
 }
 
+static int
+ieee80211_start_pmsr(struct wiphy *wiphy, struct wireless_dev *dev,
+                    struct cfg80211_pmsr_request *request)
+{
+       struct ieee80211_local *local = wiphy_priv(wiphy);
+       struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(dev);
+
+       return drv_start_pmsr(local, sdata, request);
+}
+
+static void
+ieee80211_abort_pmsr(struct wiphy *wiphy, struct wireless_dev *dev,
+                    struct cfg80211_pmsr_request *request)
+{
+       struct ieee80211_local *local = wiphy_priv(wiphy);
+       struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(dev);
+
+       return drv_abort_pmsr(local, sdata, request);
+}
+
 const struct cfg80211_ops mac80211_config_ops = {
        .add_virtual_intf = ieee80211_add_iface,
        .del_virtual_intf = ieee80211_del_iface,
@@ -3945,4 +3968,6 @@ const struct cfg80211_ops mac80211_config_ops = {
        .tx_control_port = ieee80211_tx_control_port,
        .get_txq_stats = ieee80211_get_txq_stats,
        .get_ftm_responder_stats = ieee80211_get_ftm_responder_stats,
+       .start_pmsr = ieee80211_start_pmsr,
+       .abort_pmsr = ieee80211_abort_pmsr,
 };