This allows user space to start/stop NAN interface.
A NAN interface is like P2P device in a few aspects: it
doesn't have a netdev associated to it.
Add the new interface type and prevent operations that
can't be executed on NAN interface like scan.
Define several attributes that may be configured by user space
when starting NAN functionality (master preference and dual
band operation)
Signed-off-by: Andrei Otcheretianski <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
---
v2: allow master preference 1 and 255 as required by the certification
---
include/net/cfg80211.h | 21 +++++++++-
include/uapi/linux/nl80211.h | 44 ++++++++++++++++++++
net/mac80211/cfg.c | 2 +
net/mac80211/chan.c | 3 ++
net/mac80211/iface.c | 4 ++
net/mac80211/offchannel.c | 1 +
net/mac80211/rx.c | 3 ++
net/mac80211/util.c | 1 +
net/wireless/chan.c | 2 +
net/wireless/core.c | 34 ++++++++++++++++
net/wireless/core.h | 3 ++
net/wireless/mlme.c | 1 +
net/wireless/nl80211.c | 96 ++++++++++++++++++++++++++++++++++++++++++--
net/wireless/rdev-ops.h | 20 +++++++++
net/wireless/trace.h | 27 +++++++++++++
net/wireless/util.c | 6 ++-
16 files changed, 261 insertions(+), 7 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9e1b24c..cb5ab88 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2228,6 +2228,19 @@ struct cfg80211_qos_map {
};
/**
+ * struct cfg80211_nan_conf - nan configuration
+ *
+ * This struct defines nan configuration parameters
+ *
+ * @master_pref: master preference (2 -254)
+ * @dual: dual band operation mode
+ */
+struct cfg80211_nan_conf {
+ u8 master_pref;
+ enum nl80211_nan_dual_band_conf dual;
+};
+
+/**
* struct cfg80211_ops - backend description for wireless configuration
*
* This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2500,6 +2513,8 @@ struct cfg80211_qos_map {
* and returning to the base channel for communication with the AP.
* @tdls_cancel_channel_switch: Stop channel-switching with a TDLS peer. Both
* peers must be on the base channel when the call completes.
+ * @start_nan: Start the NAN interface.
+ * @stop_nan: Stop the NAN interface.
*/
struct cfg80211_ops {
int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -2765,6 +2780,9 @@ struct cfg80211_ops {
void (*tdls_cancel_channel_switch)(struct wiphy *wiphy,
struct net_device *dev,
const u8 *addr);
+ int (*start_nan)(struct wiphy *wiphy, struct wireless_dev *wdev,
+ struct cfg80211_nan_conf *conf);
+ void (*stop_nan)(struct wiphy *wiphy, struct wireless_dev *wdev);
};
/*
@@ -3486,6 +3504,7 @@ struct cfg80211_cached_keys;
* beacons, 0 when not valid
* @address: The address for this device, valid only if @netdev is %NULL
* @p2p_started: true if this is a P2P Device that has been started
+ * @nan_started: true if this is a NAN interface that has been started
* @cac_started: true if DFS channel availability check has been started
* @cac_start_time: timestamp (jiffies) when the dfs state was entered.
* @cac_time_ms: CAC time in ms
@@ -3517,7 +3536,7 @@ struct wireless_dev {
struct mutex mtx;
- bool use_4addr, p2p_started;
+ bool use_4addr, p2p_started, nan_started;
u8 address[ETH_ALEN] __aligned(sizeof(u16));
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 5a30a75..e5a7cfb 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -824,6 +824,16 @@
* not running. The driver indicates the status of the scan through
* cfg80211_scan_done().
*
+ * @NL80211_CMD_START_NAN: Start NAN operation, identified by its
+ * %NL80211_ATTR_WDEV interface. This interface must have been previously
+ * created with %NL80211_CMD_NEW_INTERFACE. After it has been started, the
+ * NAN interface will create or join a cluster. This command must have a
+ * valid %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
+ * %NL80211_ATTR_NAN_DUAL attributes.
+ * After this command NAN functions can be added.
+ * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
+ * its %NL80211_ATTR_WDEV interface.
+ *
* @NL80211_CMD_MAX: highest used command number
* @__NL80211_CMD_AFTER_LAST: internal use
*/
@@ -1012,6 +1022,9 @@ enum nl80211_commands {
NL80211_CMD_ABORT_SCAN,
+ NL80211_CMD_START_NAN,
+ NL80211_CMD_STOP_NAN,
+
/* add new commands above here */
/* used to define NL80211_CMD_MAX below */
@@ -1796,6 +1809,12 @@ enum nl80211_commands {
* connecting to a PCP, and in %NL80211_CMD_START_AP to start
* a PCP instead of AP. Relevant for DMG networks only.
*
+ * @NL80211_ATTR_NAN_MASTER_PREF: the master preference to be used by
+ * &NL80211_CMD_START_NAN. Its type is u8 and it can't be 0, 1 or 255.
+ * @NL80211_ATTR_NAN_DUAL: NAN dual band operation config (see
+ * &enum nl80211_nan_dual_band_conf). This attribute is used with
+ * &NL80211_CMD_START_NAN.
+ *
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2172,6 +2191,9 @@ enum nl80211_attrs {
NL80211_ATTR_PBSS,
+ NL80211_ATTR_NAN_MASTER_PREF,
+ NL80211_ATTR_NAN_DUAL,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -2250,6 +2272,7 @@ enum nl80211_attrs {
* commands to create and destroy one
* @NL80211_IF_TYPE_OCB: Outside Context of a BSS
* This mode corresponds to the MIB variable dot11OCBActivated=true
+ * @NL80211_IFTYPE_NAN: NAN device interface type (not a netdev)
* @NL80211_IFTYPE_MAX: highest interface type number currently defined
* @NUM_NL80211_IFTYPES: number of defined interface types
*
@@ -2270,6 +2293,7 @@ enum nl80211_iftype {
NL80211_IFTYPE_P2P_GO,
NL80211_IFTYPE_P2P_DEVICE,
NL80211_IFTYPE_OCB,
+ NL80211_IFTYPE_NAN,
/* keep last */
NUM_NL80211_IFTYPES,
@@ -4665,4 +4689,24 @@ enum nl80211_sched_scan_plan {
__NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
};
+/**
+ * enum nl80211_nan_dual_band_conf - NAN dual band configuration
+ *
+ * Defines the NAN dual band mode of operation
+ *
+ * @NL80211_NAN_BAND_DEFAULT: device default mode
+ * @NL80211_NAN_BAND_SINGLE: 2.4GHz only mode
+ * @NL80211_NAN_BAND_DUAL: 2.4GHz and 5.2GHz mode
+ */
+enum nl80211_nan_dual_band_conf {
+ NL80211_NAN_BAND_DEFAULT,
+ NL80211_NAN_BAND_SINGLE,
+ NL80211_NAN_BAND_DUAL,
+
+ /* keep last */
+ __NL80211_NAN_BAND_AFTER_LAST,
+ NL80211_NAN_BAND_MAX =
+ __NL80211_NAN_BAND_AFTER_LAST - 1,
+};
+
#endif /* __LINUX_NL80211_H */
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index fe1704c..9b4b962 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -234,6 +234,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
case NL80211_IFTYPE_UNSPECIFIED:
case NUM_NL80211_IFTYPES:
case NL80211_IFTYPE_P2P_CLIENT:
@@ -2006,6 +2007,7 @@ static int ieee80211_scan(struct wiphy *wiphy,
!(req->flags & NL80211_SCAN_FLAG_AP)))
return -EOPNOTSUPP;
break;
+ case NL80211_IFTYPE_NAN:
default:
return -EOPNOTSUPP;
}
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 2839811..e5c1922 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -274,6 +274,7 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,
ieee80211_get_max_required_bw(sdata));
break;
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
continue;
case NL80211_IFTYPE_ADHOC:
case NL80211_IFTYPE_WDS:
@@ -716,6 +717,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
switch (sdata->vif.type) {
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
continue;
case NL80211_IFTYPE_STATION:
if (!sdata->u.mgd.associated)
@@ -979,6 +981,7 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata)
case NL80211_IFTYPE_P2P_GO:
case NL80211_IFTYPE_P2P_DEVICE:
case NUM_NL80211_IFTYPES:
+ case NL80211_IFTYPE_NAN:
WARN_ON(1);
break;
}
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 453b4e74..d13f780 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -540,6 +540,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
case NL80211_IFTYPE_ADHOC:
case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_OCB:
+ case NL80211_IFTYPE_NAN:
/* no special treatment */
break;
case NL80211_IFTYPE_UNSPECIFIED:
@@ -655,6 +656,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
break;
case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
break;
default:
/* not reached */
@@ -942,6 +944,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
/* relies on synchronize_rcu() below */
RCU_INIT_POINTER(local->p2p_sdata, NULL);
/* fall through */
+ case NL80211_IFTYPE_NAN:
default:
cancel_work_sync(&sdata->work);
/*
@@ -1448,6 +1451,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
break;
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
sdata->vif.bss_conf.bssid = sdata->vif.addr;
break;
case NL80211_IFTYPE_UNSPECIFIED:
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 8b2f4ea..0355cad 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -836,6 +836,7 @@ int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
case NL80211_IFTYPE_P2P_DEVICE:
need_offchan = true;
break;
+ case NL80211_IFTYPE_NAN:
default:
return -EOPNOTSUPP;
}
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9127957..064a1db 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3486,6 +3486,9 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
ieee80211_is_probe_req(hdr->frame_control) ||
ieee80211_is_probe_resp(hdr->frame_control) ||
ieee80211_is_beacon(hdr->frame_control);
+ case NL80211_IFTYPE_NAN:
+ /* Currently no frames on NAN interface are allowed */
+ return false;
default:
break;
}
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 89f7179..99cf13d 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1974,6 +1974,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
/* nothing to do */
break;
case NL80211_IFTYPE_UNSPECIFIED:
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 59cabc9..723316f 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -372,6 +372,7 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
break;
case NL80211_IFTYPE_UNSPECIFIED:
case NUM_NL80211_IFTYPES:
@@ -945,6 +946,7 @@ cfg80211_get_chan_state(struct wireless_dev *wdev,
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
/* these interface types don't really have a channel */
return;
case NL80211_IFTYPE_UNSPECIFIED:
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 3a9c41b..3643b22 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -223,6 +223,23 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
}
}
+void cfg80211_stop_nan(struct cfg80211_registered_device *rdev,
+ struct wireless_dev *wdev)
+{
+ ASSERT_RTNL();
+
+ if (WARN_ON(wdev->iftype != NL80211_IFTYPE_NAN))
+ return;
+
+ if (!wdev->nan_started)
+ return;
+
+ rdev_stop_nan(rdev, wdev);
+ wdev->nan_started = false;
+
+ rdev->opencount--;
+}
+
void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy)
{
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
@@ -240,6 +257,9 @@ void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy)
case NL80211_IFTYPE_P2P_DEVICE:
cfg80211_stop_p2p_device(rdev, wdev);
break;
+ case NL80211_IFTYPE_NAN:
+ cfg80211_stop_nan(rdev, wdev);
+ break;
default:
break;
}
@@ -536,6 +556,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
c->limits[j].max > 1))
return -EINVAL;
+ /* Only a single NAN can be allowed */
+ if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) &&
+ c->limits[j].max > 1))
+ return -EINVAL;
+
cnt += c->limits[j].max;
/*
* Don't advertise an unsupported type
@@ -578,6 +603,10 @@ int wiphy_register(struct wiphy *wiphy)
!rdev->ops->tdls_cancel_channel_switch)))
return -EINVAL;
+ if (WARN_ON((wiphy->interface_modes & BIT(NL80211_IFTYPE_NAN)) &&
+ (!rdev->ops->start_nan || !rdev->ops->stop_nan)))
+ return -EINVAL;
+
/*
* if a wiphy has unsupported modes for regulatory channel enforcement,
* opt-out of enforcement checking
@@ -588,6 +617,7 @@ int wiphy_register(struct wiphy *wiphy)
BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_P2P_DEVICE) |
+ BIT(NL80211_IFTYPE_NAN) |
BIT(NL80211_IFTYPE_AP_VLAN) |
BIT(NL80211_IFTYPE_MONITOR)))
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
@@ -876,6 +906,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev)
cfg80211_mlme_purge_registrations(wdev);
cfg80211_stop_p2p_device(rdev, wdev);
break;
+ case NL80211_IFTYPE_NAN:
+ cfg80211_stop_nan(rdev, wdev);
+ break;
default:
WARN_ON_ONCE(1);
break;
@@ -939,6 +972,7 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev,
/* must be handled by mac80211/driver, has no APIs */
break;
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
/* cannot happen, has no netdev */
break;
case NL80211_IFTYPE_AP_VLAN:
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 022ccad..17de79b 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -476,6 +476,9 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev);
+void cfg80211_stop_nan(struct cfg80211_registered_device *rdev,
+ struct wireless_dev *wdev);
+
#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index ff32825..2a3eb8a 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -634,6 +634,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
* fall through, P2P device only supports
* public action frames
*/
+ case NL80211_IFTYPE_NAN:
default:
err = -EOPNOTSUPP;
break;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 90890f1..dd47814 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -402,6 +402,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_SCHED_SCAN_DELAY] = { .type = NLA_U32 },
[NL80211_ATTR_REG_INDOOR] = { .type = NLA_FLAG },
[NL80211_ATTR_PBSS] = { .type = NLA_FLAG },
+ [NL80211_ATTR_NAN_MASTER_PREF] = { .type = NLA_U8 },
+ [NL80211_ATTR_NAN_DUAL] = { .type = NLA_U8 },
};
/* policy for the key attributes */
@@ -901,6 +903,7 @@ static int nl80211_key_allowed(struct wireless_dev *wdev)
case NL80211_IFTYPE_UNSPECIFIED:
case NL80211_IFTYPE_OCB:
case NL80211_IFTYPE_MONITOR:
+ case NL80211_IFTYPE_NAN:
case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_WDS:
case NUM_NL80211_IFTYPES:
@@ -2663,7 +2666,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
!(rdev->wiphy.interface_modes & (1 << type)))
return -EOPNOTSUPP;
- if ((type == NL80211_IFTYPE_P2P_DEVICE ||
+ if ((type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN ||
rdev->wiphy.features & NL80211_FEATURE_MAC_ON_CREATE) &&
info->attrs[NL80211_ATTR_MAC]) {
nla_memcpy(params.macaddr, info->attrs[NL80211_ATTR_MAC],
@@ -2719,9 +2722,10 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
wdev->mesh_id_up_len);
wdev_unlock(wdev);
break;
+ case NL80211_IFTYPE_NAN:
case NL80211_IFTYPE_P2P_DEVICE:
/*
- * P2P Device doesn't have a netdev, so doesn't go
+ * P2P Device and NAN do not have a netdev, so don't go
* through the netdev notifier and must be added here
*/
mutex_init(&wdev->mtx);
@@ -5810,6 +5814,9 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
wiphy = &rdev->wiphy;
+ if (wdev->iftype == NL80211_IFTYPE_NAN)
+ return -EOPNOTSUPP;
+
if (!rdev->ops->scan)
return -EOPNOTSUPP;
@@ -8512,6 +8519,7 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info)
case NL80211_IFTYPE_P2P_GO:
case NL80211_IFTYPE_P2P_DEVICE:
break;
+ case NL80211_IFTYPE_NAN:
default:
return -EOPNOTSUPP;
}
@@ -8557,6 +8565,7 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
case NL80211_IFTYPE_MESH_POINT:
case NL80211_IFTYPE_P2P_GO:
break;
+ case NL80211_IFTYPE_NAN:
default:
return -EOPNOTSUPP;
}
@@ -8673,6 +8682,7 @@ static int nl80211_tx_mgmt_cancel_wait(struct sk_buff *skb, struct genl_info *in
case NL80211_IFTYPE_P2P_GO:
case NL80211_IFTYPE_P2P_DEVICE:
break;
+ case NL80211_IFTYPE_NAN:
default:
return -EOPNOTSUPP;
}
@@ -10014,6 +10024,60 @@ static int nl80211_stop_p2p_device(struct sk_buff *skb, struct genl_info *info)
return 0;
}
+static int nl80211_start_nan(struct sk_buff *skb, struct genl_info *info)
+{
+ struct cfg80211_registered_device *rdev = info->user_ptr[0];
+ struct wireless_dev *wdev = info->user_ptr[1];
+ struct cfg80211_nan_conf conf = {};
+ int err;
+
+ if (wdev->iftype != NL80211_IFTYPE_NAN)
+ return -EOPNOTSUPP;
+
+ if (wdev->nan_started)
+ return -EEXIST;
+
+ if (rfkill_blocked(rdev->rfkill))
+ return -ERFKILL;
+
+ if (!info->attrs[NL80211_ATTR_NAN_MASTER_PREF])
+ return -EINVAL;
+
+ if (!info->attrs[NL80211_ATTR_NAN_DUAL])
+ return -EINVAL;
+
+ conf.master_pref =
+ nla_get_u8(info->attrs[NL80211_ATTR_NAN_MASTER_PREF]);
+ if (!conf.master_pref)
+ return -EINVAL;
+
+ conf.dual = nla_get_u8(info->attrs[NL80211_ATTR_NAN_DUAL]);
+ if (conf.dual > NL80211_NAN_BAND_MAX)
+ return -EINVAL;
+
+ err = rdev_start_nan(rdev, wdev, &conf);
+ if (err)
+ return err;
+
+ wdev->nan_started = true;
+ rdev->opencount++;
+
+ return 0;
+}
+
+static int nl80211_stop_nan(struct sk_buff *skb, struct genl_info *info)
+{
+ struct cfg80211_registered_device *rdev = info->user_ptr[0];
+ struct wireless_dev *wdev = info->user_ptr[1];
+
+ if (wdev->iftype != NL80211_IFTYPE_NAN)
+ return -EOPNOTSUPP;
+
+ cfg80211_stop_nan(rdev, wdev);
+
+ return 0;
+}
+
static int nl80211_get_protocol_features(struct sk_buff *skb,
struct genl_info *info)
{
@@ -10168,7 +10232,8 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)
if (wdev->netdev &&
!netif_running(wdev->netdev))
return -ENETDOWN;
- if (!wdev->netdev && !wdev->p2p_started)
+ if (!wdev->netdev && !wdev->p2p_started &&
+ !wdev->nan_started)
return -ENETDOWN;
}
@@ -10715,7 +10780,14 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
dev_hold(dev);
} else if (ops->internal_flags & NL80211_FLAG_CHECK_NETDEV_UP) {
- if (!wdev->p2p_started) {
+ if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE &&
+ !wdev->p2p_started) {
+ if (rtnl)
+ rtnl_unlock();
+ return -ENETDOWN;
+ }
+ if (wdev->iftype == NL80211_IFTYPE_NAN &&
+ !wdev->nan_started) {
if (rtnl)
rtnl_unlock();
return -ENETDOWN;
@@ -11349,6 +11421,22 @@ static const struct genl_ops nl80211_ops[] = {
NL80211_FLAG_NEED_RTNL,
},
{
+ .cmd = NL80211_CMD_START_NAN,
+ .doit = nl80211_start_nan,
+ .policy = nl80211_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = NL80211_FLAG_NEED_WDEV |
+ NL80211_FLAG_NEED_RTNL,
+ },
+ {
+ .cmd = NL80211_CMD_STOP_NAN,
+ .doit = nl80211_stop_nan,
+ .policy = nl80211_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = NL80211_FLAG_NEED_WDEV_UP |
+ NL80211_FLAG_NEED_RTNL,
+ },
+ {
.cmd = NL80211_CMD_SET_MCAST_RATE,
.doit = nl80211_set_mcast_rate,
.policy = nl80211_policy,
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 8ae0c04..b081261 100644
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -887,6 +887,26 @@ static inline void rdev_stop_p2p_device(struct cfg80211_registered_device *rdev,
trace_rdev_return_void(&rdev->wiphy);
}
+static inline int rdev_start_nan(struct cfg80211_registered_device *rdev,
+ struct wireless_dev *wdev,
+ struct cfg80211_nan_conf *conf)
+{
+ int ret;
+
+ trace_rdev_start_nan(&rdev->wiphy, wdev, conf);
+ ret = rdev->ops->start_nan(&rdev->wiphy, wdev, conf);
+ trace_rdev_return_int(&rdev->wiphy, ret);
+ return ret;
+}
+
+static inline void rdev_stop_nan(struct cfg80211_registered_device *rdev,
+ struct wireless_dev *wdev)
+{
+ trace_rdev_stop_nan(&rdev->wiphy, wdev);
+ rdev->ops->stop_nan(&rdev->wiphy, wdev);
+ trace_rdev_return_void(&rdev->wiphy);
+}
+
static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev,
struct net_device *dev,
struct cfg80211_acl_data *params)
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 09b242b..39fbf9a 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -1887,6 +1887,33 @@ DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_p2p_device,
TP_ARGS(wiphy, wdev)
);
+TRACE_EVENT(rdev_start_nan,
+ TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
+ struct cfg80211_nan_conf *conf),
+ TP_ARGS(wiphy, wdev, conf),
+ TP_STRUCT__entry(
+ WIPHY_ENTRY
+ WDEV_ENTRY
+ __field(u8, master_pref)
+ __field(u8, dual);
+ ),
+ TP_fast_assign(
+ WIPHY_ASSIGN;
+ WDEV_ASSIGN;
+ __entry->master_pref = conf->master_pref;
+ __entry->dual = conf->dual;
+ ),
+ TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT
+ ", master preference: %u, dual: %d",
+ WIPHY_PR_ARG, WDEV_PR_ARG, __entry->master_pref,
+ __entry->dual)
+);
+
+DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_nan,
+ TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
+ TP_ARGS(wiphy, wdev)
+);
+
TRACE_EVENT(rdev_set_mac_acl,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_acl_data *params),
diff --git a/net/wireless/util.c b/net/wireless/util.c
index c7f6820..bdf0c40 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1003,8 +1003,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
if (otype == NL80211_IFTYPE_AP_VLAN)
return -EOPNOTSUPP;
- /* cannot change into P2P device type */
- if (ntype == NL80211_IFTYPE_P2P_DEVICE)
+ /* cannot change into P2P device or nan */
+ if (ntype == NL80211_IFTYPE_P2P_DEVICE ||
+ ntype == NL80211_IFTYPE_NAN)
return -EOPNOTSUPP;
if (!rdev->ops->change_virtual_intf ||
@@ -1083,6 +1084,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
/* not happening */
break;
case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_NAN:
WARN_ON(1);
break;
}
--
2.5.0
T24gVGh1LCAyMDE2LTAzLTI0IGF0IDE5OjMwICswMTAwLCBBcmVuZCBWYW4gU3ByaWVsIHdyb3Rl
Og0KPiANCj4gT24gMjQtMy0yMDE2IDE2OjEyLCBFbW1hbnVlbCBHcnVtYmFjaCB3cm90ZToNCj4g
PiBUaGlzIGFsbG93cyB1c2VyIHNwYWNlIHRvIHN0YXJ0L3N0b3AgTkFOIGludGVyZmFjZS4NCj4g
PiBBIE5BTiBpbnRlcmZhY2UgaXMgbGlrZSBQMlAgZGV2aWNlIGluIGEgZmV3IGFzcGVjdHM6IGl0
DQo+ID4gZG9lc24ndCBoYXZlIGEgbmV0ZGV2IGFzc29jaWF0ZWQgdG8gaXQuDQo+ID4gQWRkIHRo
ZSBuZXcgaW50ZXJmYWNlIHR5cGUgYW5kIHByZXZlbnQgb3BlcmF0aW9ucyB0aGF0DQo+ID4gY2Fu
J3QgYmUgZXhlY3V0ZWQgb24gTkFOIGludGVyZmFjZSBsaWtlIHNjYW4uDQo+ID4gRGVmaW5lIHNl
dmVyYWwgYXR0cmlidXRlcyB0aGF0IG1heSBiZSBjb25maWd1cmVkIGJ5IHVzZXIgc3BhY2UNCj4g
PiB3aGVuIHN0YXJ0aW5nIE5BTiBmdW5jdGlvbmFsaXR5IChtYXN0ZXIgcHJlZmVyZW5jZSBhbmQg
ZHVhbA0KPiA+IGJhbmQgb3BlcmF0aW9uKQ0KPiA+IA0KPiA+IFNpZ25lZC1vZmYtYnk6IEFuZHJl
aSBPdGNoZXJldGlhbnNraSA8DQo+ID4gYW5kcmVpLm90Y2hlcmV0aWFuc2tpQGludGVsLmNvbT4N
Cj4gPiBTaWduZWQtb2ZmLWJ5OiBFbW1hbnVlbCBHcnVtYmFjaCA8ZW1tYW51ZWwuZ3J1bWJhY2hA
aW50ZWwuY29tPg0KPiA+IC0tLQ0KPiA+IHYyOiBhbGxvdyBtYXN0ZXIgcHJlZmVyZW5jZSAxIGFu
ZCAyNTUgYXMgcmVxdWlyZWQgYnkgdGhlDQo+ID4gY2VydGlmaWNhdGlvbg0KPiA+IC0tLQ0KPiA+
ICBpbmNsdWRlL25ldC9jZmc4MDIxMS5oICAgICAgIHwgMjEgKysrKysrKysrLQ0KPiA+ICBpbmNs
dWRlL3VhcGkvbGludXgvbmw4MDIxMS5oIHwgNDQgKysrKysrKysrKysrKysrKysrKysNCj4gPiAg
bmV0L21hYzgwMjExL2NmZy5jICAgICAgICAgICB8ICAyICsNCj4gPiAgbmV0L21hYzgwMjExL2No
YW4uYyAgICAgICAgICB8ICAzICsrDQo+ID4gIG5ldC9tYWM4MDIxMS9pZmFjZS5jICAgICAgICAg
fCAgNCArKw0KPiA+ICBuZXQvbWFjODAyMTEvb2ZmY2hhbm5lbC5jICAgIHwgIDEgKw0KPiA+ICBu
ZXQvbWFjODAyMTEvcnguYyAgICAgICAgICAgIHwgIDMgKysNCj4gPiAgbmV0L21hYzgwMjExL3V0
aWwuYyAgICAgICAgICB8ICAxICsNCj4gPiAgbmV0L3dpcmVsZXNzL2NoYW4uYyAgICAgICAgICB8
ICAyICsNCj4gPiAgbmV0L3dpcmVsZXNzL2NvcmUuYyAgICAgICAgICB8IDM0ICsrKysrKysrKysr
KysrKysNCj4gPiAgbmV0L3dpcmVsZXNzL2NvcmUuaCAgICAgICAgICB8ICAzICsrDQo+ID4gIG5l
dC93aXJlbGVzcy9tbG1lLmMgICAgICAgICAgfCAgMSArDQo+ID4gIG5ldC93aXJlbGVzcy9ubDgw
MjExLmMgICAgICAgfCA5Ng0KPiA+ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKy0tDQo+ID4gIG5ldC93aXJlbGVzcy9yZGV2LW9wcy5oICAgICAgfCAyMCArKysrKysr
KysNCj4gPiAgbmV0L3dpcmVsZXNzL3RyYWNlLmggICAgICAgICB8IDI3ICsrKysrKysrKysrKysN
Cj4gPiAgbmV0L3dpcmVsZXNzL3V0aWwuYyAgICAgICAgICB8ICA2ICsrLQ0KPiA+ICAxNiBmaWxl
cyBjaGFuZ2VkLCAyNjEgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkNCj4gPiANCj4gPiBk
aWZmIC0tZ2l0IGEvaW5jbHVkZS9uZXQvY2ZnODAyMTEuaCBiL2luY2x1ZGUvbmV0L2NmZzgwMjEx
LmgNCj4gPiBpbmRleCA5ZTFiMjRjLi5jYjVhYjg4IDEwMDY0NA0KPiA+IC0tLSBhL2luY2x1ZGUv
bmV0L2NmZzgwMjExLmgNCj4gPiArKysgYi9pbmNsdWRlL25ldC9jZmc4MDIxMS5oDQo+ID4gQEAg
LTIyMjgsNiArMjIyOCwxOSBAQCBzdHJ1Y3QgY2ZnODAyMTFfcW9zX21hcCB7DQo+ID4gIH07DQo+
ID4gIA0KPiA+ICAvKioNCj4gPiArICogc3RydWN0IGNmZzgwMjExX25hbl9jb25mIC0gbmFuIGNv
bmZpZ3VyYXRpb24NCj4gPiArICoNCj4gPiArICogVGhpcyBzdHJ1Y3QgZGVmaW5lcyBuYW4gY29u
ZmlndXJhdGlvbiBwYXJhbWV0ZXJzDQo+ID4gKyAqDQo+ID4gKyAqIEBtYXN0ZXJfcHJlZjogbWFz
dGVyIHByZWZlcmVuY2UgKDIgLTI1NCkNCj4gDQo+IFRoaXMgc2VlbXMgdG8gY29udHJhZGljdCB0
aGUgY2hhbmdlIGxvZyBhYm92ZS4uLg0KDQpUaGFua3MgZm9yIGNhdGNoaW5nIHRoaXMuDQoNCj4g
DQo+ID4gKyAqIEBkdWFsOiBkdWFsIGJhbmQgb3BlcmF0aW9uIG1vZGUNCj4gPiArICovDQo+ID4g
K3N0cnVjdCBjZmc4MDIxMV9uYW5fY29uZiB7DQo+ID4gKwl1OCBtYXN0ZXJfcHJlZjsNCj4gPiAr
CWVudW0gbmw4MDIxMV9uYW5fZHVhbF9iYW5kX2NvbmYgZHVhbDsNCj4gPiArfTsNCj4gPiArDQo+
ID4gKy8qKg0KPiA+ICAgKiBzdHJ1Y3QgY2ZnODAyMTFfb3BzIC0gYmFja2VuZCBkZXNjcmlwdGlv
biBmb3Igd2lyZWxlc3MNCj4gPiBjb25maWd1cmF0aW9uDQo+ID4gICAqDQo+ID4gICAqIFRoaXMg
c3RydWN0IGlzIHJlZ2lzdGVyZWQgYnkgZnVsbG1hYyBjYXJkIGRyaXZlcnMgYW5kL29yDQo+ID4g
d2lyZWxlc3Mgc3RhY2tzDQo+ID4gQEAgLTI1MDAsNiArMjUxMyw4IEBAIHN0cnVjdCBjZmc4MDIx
MV9xb3NfbWFwIHsNCj4gPiAgICoJYW5kIHJldHVybmluZyB0byB0aGUgYmFzZSBjaGFubmVsIGZv
ciBjb21tdW5pY2F0aW9uIHdpdGgNCj4gPiB0aGUgQVAuDQo+ID4gICAqIEB0ZGxzX2NhbmNlbF9j
aGFubmVsX3N3aXRjaDogU3RvcCBjaGFubmVsLXN3aXRjaGluZyB3aXRoIGEgVERMUw0KPiA+IHBl
ZXIuIEJvdGgNCj4gPiAgICoJcGVlcnMgbXVzdCBiZSBvbiB0aGUgYmFzZSBjaGFubmVsIHdoZW4g
dGhlIGNhbGwNCj4gPiBjb21wbGV0ZXMuDQo+ID4gKyAqIEBzdGFydF9uYW46IFN0YXJ0IHRoZSBO
QU4gaW50ZXJmYWNlLg0KPiA+ICsgKiBAc3RvcF9uYW46IFN0b3AgdGhlIE5BTiBpbnRlcmZhY2Uu
DQo+ID4gICAqLw0KPiA+ICBzdHJ1Y3QgY2ZnODAyMTFfb3BzIHsNCj4gPiAgCWludAkoKnN1c3Bl
bmQpKHN0cnVjdCB3aXBoeSAqd2lwaHksIHN0cnVjdA0KPiA+IGNmZzgwMjExX3dvd2xhbiAqd293
KTsNCj4gPiBAQCAtMjc2NSw2ICsyNzgwLDkgQEAgc3RydWN0IGNmZzgwMjExX29wcyB7DQo+ID4g
IAl2b2lkCSgqdGRsc19jYW5jZWxfY2hhbm5lbF9zd2l0Y2gpKHN0cnVjdCB3aXBoeQ0KPiA+ICp3
aXBoeSwNCj4gPiAgCQkJCQkgICAgICBzdHJ1Y3QgbmV0X2RldmljZQ0KPiA+ICpkZXYsDQo+ID4g
IAkJCQkJICAgICAgY29uc3QgdTggKmFkZHIpOw0KPiA+ICsJaW50CSgqc3RhcnRfbmFuKShzdHJ1
Y3Qgd2lwaHkgKndpcGh5LCBzdHJ1Y3QNCj4gPiB3aXJlbGVzc19kZXYgKndkZXYsDQo+ID4gKwkJ
CSAgICAgc3RydWN0IGNmZzgwMjExX25hbl9jb25mICpjb25mKTsNCj4gPiArCXZvaWQJKCpzdG9w
X25hbikoc3RydWN0IHdpcGh5ICp3aXBoeSwgc3RydWN0DQo+ID4gd2lyZWxlc3NfZGV2ICp3ZGV2
KTsNCj4gPiAgfTsNCj4gPiAgDQo+ID4gIC8qDQo+ID4gQEAgLTM0ODYsNiArMzUwNCw3IEBAIHN0
cnVjdCBjZmc4MDIxMV9jYWNoZWRfa2V5czsNCj4gPiAgICoJYmVhY29ucywgMCB3aGVuIG5vdCB2
YWxpZA0KPiA+ICAgKiBAYWRkcmVzczogVGhlIGFkZHJlc3MgZm9yIHRoaXMgZGV2aWNlLCB2YWxp
ZCBvbmx5IGlmIEBuZXRkZXYgaXMNCj4gPiAlTlVMTA0KPiA+ICAgKiBAcDJwX3N0YXJ0ZWQ6IHRy
dWUgaWYgdGhpcyBpcyBhIFAyUCBEZXZpY2UgdGhhdCBoYXMgYmVlbg0KPiA+IHN0YXJ0ZWQNCj4g
PiArICogQG5hbl9zdGFydGVkOiB0cnVlIGlmIHRoaXMgaXMgYSBOQU4gaW50ZXJmYWNlIHRoYXQg
aGFzIGJlZW4NCj4gPiBzdGFydGVkDQo+ID4gICAqIEBjYWNfc3RhcnRlZDogdHJ1ZSBpZiBERlMg
Y2hhbm5lbCBhdmFpbGFiaWxpdHkgY2hlY2sgaGFzIGJlZW4NCj4gPiBzdGFydGVkDQo+ID4gICAq
IEBjYWNfc3RhcnRfdGltZTogdGltZXN0YW1wIChqaWZmaWVzKSB3aGVuIHRoZSBkZnMgc3RhdGUg
d2FzDQo+ID4gZW50ZXJlZC4NCj4gPiAgICogQGNhY190aW1lX21zOiBDQUMgdGltZSBpbiBtcw0K
PiA+IEBAIC0zNTE3LDcgKzM1MzYsNyBAQCBzdHJ1Y3Qgd2lyZWxlc3NfZGV2IHsNCj4gPiAgDQo+
ID4gIAlzdHJ1Y3QgbXV0ZXggbXR4Ow0KPiA+ICANCj4gPiAtCWJvb2wgdXNlXzRhZGRyLCBwMnBf
c3RhcnRlZDsNCj4gPiArCWJvb2wgdXNlXzRhZGRyLCBwMnBfc3RhcnRlZCwgbmFuX3N0YXJ0ZWQ7
DQo+ID4gIA0KPiA+ICAJdTggYWRkcmVzc1tFVEhfQUxFTl0gX19hbGlnbmVkKHNpemVvZih1MTYp
KTsNCj4gPiAgDQo+ID4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9ubDgwMjExLmgN
Cj4gPiBiL2luY2x1ZGUvdWFwaS9saW51eC9ubDgwMjExLmgNCj4gPiBpbmRleCA1YTMwYTc1Li5l
NWE3Y2ZiIDEwMDY0NA0KPiA+IC0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9ubDgwMjExLmgNCj4g
PiArKysgYi9pbmNsdWRlL3VhcGkvbGludXgvbmw4MDIxMS5oDQo+ID4gQEAgLTgyNCw2ICs4MjQs
MTYgQEANCj4gPiAgICoJbm90IHJ1bm5pbmcuIFRoZSBkcml2ZXIgaW5kaWNhdGVzIHRoZSBzdGF0
dXMgb2YgdGhlIHNjYW4NCj4gPiB0aHJvdWdoDQo+ID4gICAqCWNmZzgwMjExX3NjYW5fZG9uZSgp
Lg0KPiA+ICAgKg0KPiA+ICsgKiBATkw4MDIxMV9DTURfU1RBUlRfTkFOOiBTdGFydCBOQU4gb3Bl
cmF0aW9uLCBpZGVudGlmaWVkIGJ5IGl0cw0KPiA+ICsgKgklTkw4MDIxMV9BVFRSX1dERVYgaW50
ZXJmYWNlLiBUaGlzIGludGVyZmFjZSBtdXN0IGhhdmUNCj4gPiBiZWVuIHByZXZpb3VzbHkNCj4g
PiArICoJY3JlYXRlZCB3aXRoICVOTDgwMjExX0NNRF9ORVdfSU5URVJGQUNFLiBBZnRlciBpdCBo
YXMNCj4gPiBiZWVuIHN0YXJ0ZWQsIHRoZQ0KPiA+ICsgKglOQU4gaW50ZXJmYWNlIHdpbGwgY3Jl
YXRlIG9yIGpvaW4gYSBjbHVzdGVyLiBUaGlzDQo+ID4gY29tbWFuZCBtdXN0IGhhdmUgYQ0KPiA+
ICsgKgl2YWxpZCAlTkw4MDIxMV9BVFRSX05BTl9NQVNURVJfUFJFRiBhdHRyaWJ1dGUgYW5kDQo+
ID4gb3B0aW9uYWwNCj4gPiArICoJJU5MODAyMTFfQVRUUl9OQU5fRFVBTCBhdHRyaWJ1dGVzLg0K
PiA+ICsgKglBZnRlciB0aGlzIGNvbW1hbmQgTkFOIGZ1bmN0aW9ucyBjYW4gYmUgYWRkZWQuDQo+
ID4gKyAqIEBOTDgwMjExX0NNRF9TVE9QX05BTjogU3RvcCB0aGUgTkFOIG9wZXJhdGlvbiwgaWRl
bnRpZmllZCBieQ0KPiA+ICsgKglpdHMgJU5MODAyMTFfQVRUUl9XREVWIGludGVyZmFjZS4NCj4g
PiArICoNCj4gPiAgICogQE5MODAyMTFfQ01EX01BWDogaGlnaGVzdCB1c2VkIGNvbW1hbmQgbnVt
YmVyDQo+ID4gICAqIEBfX05MODAyMTFfQ01EX0FGVEVSX0xBU1Q6IGludGVybmFsIHVzZQ0KPiA+
ICAgKi8NCj4gPiBAQCAtMTAxMiw2ICsxMDIyLDkgQEAgZW51bSBubDgwMjExX2NvbW1hbmRzIHsN
Cj4gPiAgDQo+ID4gIAlOTDgwMjExX0NNRF9BQk9SVF9TQ0FOLA0KPiA+ICANCj4gPiArCU5MODAy
MTFfQ01EX1NUQVJUX05BTiwNCj4gPiArCU5MODAyMTFfQ01EX1NUT1BfTkFOLA0KPiA+ICsNCj4g
PiAgCS8qIGFkZCBuZXcgY29tbWFuZHMgYWJvdmUgaGVyZSAqLw0KPiA+ICANCj4gPiAgCS8qIHVz
ZWQgdG8gZGVmaW5lIE5MODAyMTFfQ01EX01BWCBiZWxvdyAqLw0KPiA+IEBAIC0xNzk2LDYgKzE4
MDksMTIgQEAgZW51bSBubDgwMjExX2NvbW1hbmRzIHsNCj4gPiAgICoJY29ubmVjdGluZyB0byBh
IFBDUCwgYW5kIGluICVOTDgwMjExX0NNRF9TVEFSVF9BUCB0bw0KPiA+IHN0YXJ0DQo+ID4gICAq
CWEgUENQIGluc3RlYWQgb2YgQVAuIFJlbGV2YW50IGZvciBETUcgbmV0d29ya3Mgb25seS4NCj4g
PiAgICoNCj4gPiArICogQE5MODAyMTFfQVRUUl9OQU5fTUFTVEVSX1BSRUY6IHRoZSBtYXN0ZXIg
cHJlZmVyZW5jZSB0byBiZSB1c2VkDQo+ID4gYnkNCj4gPiArICoJJk5MODAyMTFfQ01EX1NUQVJU
X05BTi4gSXRzIHR5cGUgaXMgdTggYW5kIGl0IGNhbid0IGJlDQo+ID4gMCwgMSBvciAyNTUuDQo+
IA0KPiAuLi4gYW5kIHRoaXMgYXMgd2VsbC4NCj4gDQoNCll1cCAtIEknbGwgcmVwb3N0DQoNCj4g
UmVnYXJkcywNCj4gQXJlbmQ=
On 24-3-2016 16:12, Emmanuel Grumbach wrote:
> This allows user space to start/stop NAN interface.
> A NAN interface is like P2P device in a few aspects: it
> doesn't have a netdev associated to it.
> Add the new interface type and prevent operations that
> can't be executed on NAN interface like scan.
> Define several attributes that may be configured by user space
> when starting NAN functionality (master preference and dual
> band operation)
>
> Signed-off-by: Andrei Otcheretianski <[email protected]>
> Signed-off-by: Emmanuel Grumbach <[email protected]>
> ---
> v2: allow master preference 1 and 255 as required by the certification
> ---
> include/net/cfg80211.h | 21 +++++++++-
> include/uapi/linux/nl80211.h | 44 ++++++++++++++++++++
> net/mac80211/cfg.c | 2 +
> net/mac80211/chan.c | 3 ++
> net/mac80211/iface.c | 4 ++
> net/mac80211/offchannel.c | 1 +
> net/mac80211/rx.c | 3 ++
> net/mac80211/util.c | 1 +
> net/wireless/chan.c | 2 +
> net/wireless/core.c | 34 ++++++++++++++++
> net/wireless/core.h | 3 ++
> net/wireless/mlme.c | 1 +
> net/wireless/nl80211.c | 96 ++++++++++++++++++++++++++++++++++++++++++--
> net/wireless/rdev-ops.h | 20 +++++++++
> net/wireless/trace.h | 27 +++++++++++++
> net/wireless/util.c | 6 ++-
> 16 files changed, 261 insertions(+), 7 deletions(-)
>
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index 9e1b24c..cb5ab88 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -2228,6 +2228,19 @@ struct cfg80211_qos_map {
> };
>
> /**
> + * struct cfg80211_nan_conf - nan configuration
> + *
> + * This struct defines nan configuration parameters
> + *
> + * @master_pref: master preference (2 -254)
This seems to contradict the change log above...
> + * @dual: dual band operation mode
> + */
> +struct cfg80211_nan_conf {
> + u8 master_pref;
> + enum nl80211_nan_dual_band_conf dual;
> +};
> +
> +/**
> * struct cfg80211_ops - backend description for wireless configuration
> *
> * This struct is registered by fullmac card drivers and/or wireless stacks
> @@ -2500,6 +2513,8 @@ struct cfg80211_qos_map {
> * and returning to the base channel for communication with the AP.
> * @tdls_cancel_channel_switch: Stop channel-switching with a TDLS peer. Both
> * peers must be on the base channel when the call completes.
> + * @start_nan: Start the NAN interface.
> + * @stop_nan: Stop the NAN interface.
> */
> struct cfg80211_ops {
> int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
> @@ -2765,6 +2780,9 @@ struct cfg80211_ops {
> void (*tdls_cancel_channel_switch)(struct wiphy *wiphy,
> struct net_device *dev,
> const u8 *addr);
> + int (*start_nan)(struct wiphy *wiphy, struct wireless_dev *wdev,
> + struct cfg80211_nan_conf *conf);
> + void (*stop_nan)(struct wiphy *wiphy, struct wireless_dev *wdev);
> };
>
> /*
> @@ -3486,6 +3504,7 @@ struct cfg80211_cached_keys;
> * beacons, 0 when not valid
> * @address: The address for this device, valid only if @netdev is %NULL
> * @p2p_started: true if this is a P2P Device that has been started
> + * @nan_started: true if this is a NAN interface that has been started
> * @cac_started: true if DFS channel availability check has been started
> * @cac_start_time: timestamp (jiffies) when the dfs state was entered.
> * @cac_time_ms: CAC time in ms
> @@ -3517,7 +3536,7 @@ struct wireless_dev {
>
> struct mutex mtx;
>
> - bool use_4addr, p2p_started;
> + bool use_4addr, p2p_started, nan_started;
>
> u8 address[ETH_ALEN] __aligned(sizeof(u16));
>
> diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
> index 5a30a75..e5a7cfb 100644
> --- a/include/uapi/linux/nl80211.h
> +++ b/include/uapi/linux/nl80211.h
> @@ -824,6 +824,16 @@
> * not running. The driver indicates the status of the scan through
> * cfg80211_scan_done().
> *
> + * @NL80211_CMD_START_NAN: Start NAN operation, identified by its
> + * %NL80211_ATTR_WDEV interface. This interface must have been previously
> + * created with %NL80211_CMD_NEW_INTERFACE. After it has been started, the
> + * NAN interface will create or join a cluster. This command must have a
> + * valid %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
> + * %NL80211_ATTR_NAN_DUAL attributes.
> + * After this command NAN functions can be added.
> + * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
> + * its %NL80211_ATTR_WDEV interface.
> + *
> * @NL80211_CMD_MAX: highest used command number
> * @__NL80211_CMD_AFTER_LAST: internal use
> */
> @@ -1012,6 +1022,9 @@ enum nl80211_commands {
>
> NL80211_CMD_ABORT_SCAN,
>
> + NL80211_CMD_START_NAN,
> + NL80211_CMD_STOP_NAN,
> +
> /* add new commands above here */
>
> /* used to define NL80211_CMD_MAX below */
> @@ -1796,6 +1809,12 @@ enum nl80211_commands {
> * connecting to a PCP, and in %NL80211_CMD_START_AP to start
> * a PCP instead of AP. Relevant for DMG networks only.
> *
> + * @NL80211_ATTR_NAN_MASTER_PREF: the master preference to be used by
> + * &NL80211_CMD_START_NAN. Its type is u8 and it can't be 0, 1 or 255.
... and this as well.
Regards,
Arend