nl80211: Add control_port_over_nl80211 to mesh_setup
Signed-off-by: Denis Kenzior <denkenz@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
c3bfe1f6fc
commit
1224f5831a
|
@ -1454,6 +1454,8 @@ struct mesh_config {
|
||||||
* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
|
* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
|
||||||
* changes the channel when a radar is detected. This is required
|
* changes the channel when a radar is detected. This is required
|
||||||
* to operate on DFS channels.
|
* to operate on DFS channels.
|
||||||
|
* @control_port_over_nl80211: TRUE if userspace expects to exchange control
|
||||||
|
* port frames over NL80211 instead of the network interface.
|
||||||
*
|
*
|
||||||
* These parameters are fixed when the mesh is created.
|
* These parameters are fixed when the mesh is created.
|
||||||
*/
|
*/
|
||||||
|
@ -1476,6 +1478,7 @@ struct mesh_setup {
|
||||||
u32 basic_rates;
|
u32 basic_rates;
|
||||||
struct cfg80211_bitrate_mask beacon_rate;
|
struct cfg80211_bitrate_mask beacon_rate;
|
||||||
bool userspace_handles_dfs;
|
bool userspace_handles_dfs;
|
||||||
|
bool control_port_over_nl80211;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -10168,6 +10168,15 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
|
||||||
setup.userspace_handles_dfs =
|
setup.userspace_handles_dfs =
|
||||||
nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]);
|
nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]);
|
||||||
|
|
||||||
|
if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) {
|
||||||
|
int r = validate_pae_over_nl80211(rdev, info);
|
||||||
|
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
|
setup.control_port_over_nl80211 = true;
|
||||||
|
}
|
||||||
|
|
||||||
wdev_lock(dev->ieee80211_ptr);
|
wdev_lock(dev->ieee80211_ptr);
|
||||||
err = __cfg80211_join_mesh(rdev, dev, &setup, &cfg);
|
err = __cfg80211_join_mesh(rdev, dev, &setup, &cfg);
|
||||||
if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER])
|
if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER])
|
||||||
|
|
Loading…
Reference in a new issue