If the user requested a userspace MPM, automatically disable auto_open_plinks to fully disable the kernel MPM.
Unified · Split
| @@ -2467,8 +2467,10 @@ enum nl80211_mesh_power_mode { · 2466 unmodified lines | |||
| 2467 | * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh | 2467 | * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh |
| 2468 | * point. | 2468 | * point. |
| 2469 | * | 2469 | * |
| 2470 | * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically | 2470 | * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open |
| 2471 | * open peer links when we detect compatible mesh peers. | 2471 | * peer links when we detect compatible mesh peers. Disabled if |
| 2472 | * @NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are | ||
| 2473 | * set. | ||
| 2472 | * | 2474 | * |
| 2473 | * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames | 2475 | * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames |
| 2474 | * containing a PREQ that an MP can send to a particular destination (path | 2476 | * containing a PREQ that an MP can send to a particular destination (path |
| @@ -7449,6 +7449,9 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) · 7448 unmodified lines | |||
| 7449 | return err; | 7449 | return err; |
| 7450 | } | 7450 | } |
| 7451 | 7451 | ||
| 7452 | if (setup.user_mpm) | ||
| 7453 | cfg.auto_open_plinks = false; | ||
| 7454 | |||
| 7452 | if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) { | 7455 | if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) { |
| 7453 | err = nl80211_parse_chandef(rdev, info, &setup.chandef); | 7456 | err = nl80211_parse_chandef(rdev, info, &setup.chandef); |
| 7454 | if (err) | 7457 | if (err) |