mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 08:46:40 +07:00
{nl,cfg,mac}80211: let userspace make meshif mesh gate
Allow userspace to set NL80211_MESHCONF_GATE_ANNOUNCEMENTS attribute, which will advertise this mesh node as being a mesh gate. NL80211_HWMP_ROOTMODE must be set or this will do nothing. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
0507e159a2
commit
16dd7267f4
@ -1864,6 +1864,10 @@ enum nl80211_mntr_flags {
|
||||
* @NL80211_MESHCONF_HWMP_RANN_INTERVAL: The interval of time (in TUs) between
|
||||
* root announcements are transmitted.
|
||||
*
|
||||
* @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
|
||||
* access to a broader network beyond the MBSS. This is done via Root
|
||||
* Announcement frames.
|
||||
*
|
||||
* @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
|
||||
*
|
||||
* @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
|
||||
@ -1886,6 +1890,7 @@ enum nl80211_meshconf_params {
|
||||
NL80211_MESHCONF_HWMP_ROOTMODE,
|
||||
NL80211_MESHCONF_ELEMENT_TTL,
|
||||
NL80211_MESHCONF_HWMP_RANN_INTERVAL,
|
||||
NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_MESHCONF_ATTR_AFTER_LAST,
|
||||
|
@ -756,6 +756,11 @@ struct mesh_config {
|
||||
u16 dot11MeshHWMPnetDiameterTraversalTime;
|
||||
u8 dot11MeshHWMPRootMode;
|
||||
u16 dot11MeshHWMPRannInterval;
|
||||
/* This is missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol
|
||||
* set to true only means that the station will announce others it's a
|
||||
* mesh gate, but not necessarily using the gate announcement protocol.
|
||||
* Still keeping the same nomenclature to be in sync with the spec. */
|
||||
bool dot11MeshGateAnnouncementProtocol;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -1137,6 +1137,10 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
|
||||
conf->dot11MeshHWMPRootMode = nconf->dot11MeshHWMPRootMode;
|
||||
ieee80211_mesh_root_setup(ifmsh);
|
||||
}
|
||||
if (_chg_mesh_attr(NL80211_MESHCONF_GATE_ANNOUNCEMENTS, mask)) {
|
||||
conf->dot11MeshGateAnnouncementProtocol =
|
||||
nconf->dot11MeshGateAnnouncementProtocol;
|
||||
}
|
||||
if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {
|
||||
conf->dot11MeshHWMPRannInterval =
|
||||
nconf->dot11MeshHWMPRannInterval;
|
||||
|
@ -372,6 +372,8 @@ IEEE80211_IF_FILE(min_discovery_timeout,
|
||||
u.mesh.mshcfg.min_discovery_timeout, DEC);
|
||||
IEEE80211_IF_FILE(dot11MeshHWMPRootMode,
|
||||
u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);
|
||||
IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol,
|
||||
u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
|
||||
IEEE80211_IF_FILE(dot11MeshHWMPRannInterval,
|
||||
u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
|
||||
#endif
|
||||
@ -489,6 +491,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)
|
||||
MESHPARAMS_ADD(min_discovery_timeout);
|
||||
MESHPARAMS_ADD(dot11MeshHWMPRootMode);
|
||||
MESHPARAMS_ADD(dot11MeshHWMPRannInterval);
|
||||
MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);
|
||||
#undef MESHPARAMS_ADD
|
||||
}
|
||||
#endif
|
||||
|
@ -1045,8 +1045,11 @@ mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)
|
||||
{
|
||||
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
|
||||
u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
|
||||
u8 flags;
|
||||
|
||||
mesh_path_sel_frame_tx(MPATH_RANN, 0, sdata->vif.addr,
|
||||
flags = (ifmsh->mshcfg.dot11MeshGateAnnouncementProtocol)
|
||||
? RANN_FLAG_IS_GATE : 0;
|
||||
mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
|
||||
cpu_to_le32(++ifmsh->sn),
|
||||
0, NULL, 0, broadcast_addr,
|
||||
0, sdata->u.mesh.mshcfg.element_ttl,
|
||||
|
@ -51,6 +51,7 @@ const struct mesh_config default_mesh_config = {
|
||||
.path_refresh_time = MESH_PATH_REFRESH_TIME,
|
||||
.min_discovery_timeout = MESH_MIN_DISCOVERY_TIMEOUT,
|
||||
.dot11MeshHWMPRannInterval = MESH_RANN_INTERVAL,
|
||||
.dot11MeshGateAnnouncementProtocol = false,
|
||||
};
|
||||
|
||||
const struct mesh_setup default_mesh_setup = {
|
||||
|
@ -3037,6 +3037,8 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
|
||||
cur_params.dot11MeshHWMPRootMode);
|
||||
NLA_PUT_U16(msg, NL80211_MESHCONF_HWMP_RANN_INTERVAL,
|
||||
cur_params.dot11MeshHWMPRannInterval);
|
||||
NLA_PUT_U8(msg, NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
|
||||
cur_params.dot11MeshGateAnnouncementProtocol);
|
||||
nla_nest_end(msg, pinfoattr);
|
||||
genlmsg_end(msg, hdr);
|
||||
return genlmsg_reply(msg, info);
|
||||
@ -3066,6 +3068,7 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
|
||||
[NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME] = { .type = NLA_U16 },
|
||||
[NL80211_MESHCONF_HWMP_ROOTMODE] = { .type = NLA_U8 },
|
||||
[NL80211_MESHCONF_HWMP_RANN_INTERVAL] = { .type = NLA_U16 },
|
||||
[NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 },
|
||||
};
|
||||
|
||||
static const struct nla_policy
|
||||
@ -3148,6 +3151,10 @@ do {\
|
||||
dot11MeshHWMPRannInterval, mask,
|
||||
NL80211_MESHCONF_HWMP_RANN_INTERVAL,
|
||||
nla_get_u16);
|
||||
FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
|
||||
dot11MeshGateAnnouncementProtocol, mask,
|
||||
NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
|
||||
nla_get_u8);
|
||||
if (mask_out)
|
||||
*mask_out = mask;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user