aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d5005c59c472..b67b1114e25a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3390,7 +3390,9 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
3390 nla_put_u8(msg, NL80211_MESHCONF_FORWARDING, 3390 nla_put_u8(msg, NL80211_MESHCONF_FORWARDING,
3391 cur_params.dot11MeshForwarding) || 3391 cur_params.dot11MeshForwarding) ||
3392 nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD, 3392 nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD,
3393 cur_params.rssi_threshold)) 3393 cur_params.rssi_threshold) ||
3394 nla_put_u32(msg, NL80211_MESHCONF_HT_OPMODE,
3395 cur_params.ht_opmode))
3394 goto nla_put_failure; 3396 goto nla_put_failure;
3395 nla_nest_end(msg, pinfoattr); 3397 nla_nest_end(msg, pinfoattr);
3396 genlmsg_end(msg, hdr); 3398 genlmsg_end(msg, hdr);
@@ -3426,6 +3428,7 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
3426 [NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 }, 3428 [NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 },
3427 [NL80211_MESHCONF_FORWARDING] = { .type = NLA_U8 }, 3429 [NL80211_MESHCONF_FORWARDING] = { .type = NLA_U8 },
3428 [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32}, 3430 [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32},
3431 [NL80211_MESHCONF_HT_OPMODE] = { .type = NLA_U16},
3429}; 3432};
3430 3433
3431static const struct nla_policy 3434static const struct nla_policy
@@ -3523,6 +3526,8 @@ do {\
3523 mask, NL80211_MESHCONF_FORWARDING, nla_get_u8); 3526 mask, NL80211_MESHCONF_FORWARDING, nla_get_u8);
3524 FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, 3527 FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold,
3525 mask, NL80211_MESHCONF_RSSI_THRESHOLD, nla_get_u32); 3528 mask, NL80211_MESHCONF_RSSI_THRESHOLD, nla_get_u32);
3529 FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode,
3530 mask, NL80211_MESHCONF_HT_OPMODE, nla_get_u16);
3526 if (mask_out) 3531 if (mask_out)
3527 *mask_out = mask; 3532 *mask_out = mask;
3528 3533