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>

1 files changed, 9 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f8e10408f2b3..ff28f8feeb09 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10168,6 +10168,15 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
         setup.userspace_handles_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);
         err = __cfg80211_join_mesh(rdev, dev, &setup, &cfg);
         if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER])