History

net: bridge: vlan: add support for mcast last member interval global option

Add support to change and retrieve global vlan multicast last member interval option.

Nikolay Aleksandrov committed 5 years ago

Commit 77f6aba1 parent 50725f63 files · +19 −0Browse files

Unified · Split

3 files
  1. include/uapi/linux/if_bridge.h +2 −0
  2. net/bridge/br_private.h +2 −0
  3. net/bridge/br_vlan_options.c +15 −0
include/uapi/linux/if_bridge.h+2−0
@@ -553,6 +553,8 @@ enum { · 552 unmodified lines
553 BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,553 BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
554 BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,554 BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,
555 BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,555 BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
556 BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
557 BRIDGE_VLANDB_GOPTS_PAD,
556 __BRIDGE_VLANDB_GOPTS_MAX558 __BRIDGE_VLANDB_GOPTS_MAX
557};559};
558#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)560#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h+2−0
@@ -1178,6 +1178,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, · 1177 unmodified lines
1178 brmctx2->multicast_last_member_count &&1178 brmctx2->multicast_last_member_count &&
1179 brmctx1->multicast_startup_query_count ==1179 brmctx1->multicast_startup_query_count ==
1180 brmctx2->multicast_startup_query_count &&1180 brmctx2->multicast_startup_query_count &&
1181 brmctx1->multicast_last_member_interval ==
1182 brmctx2->multicast_last_member_interval &&
1181#if IS_ENABLED(CONFIG_IPV6)1183#if IS_ENABLED(CONFIG_IPV6)
1182 brmctx1->multicast_mld_version ==1184 brmctx1->multicast_mld_version ==
1183 brmctx2->multicast_mld_version &&1185 brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c+15−0
@@ -272,6 +272,7 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr, · 271 unmodified lines
272bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,272bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
273 const struct net_bridge_vlan *v_opts)273 const struct net_bridge_vlan *v_opts)
274{274{
275 u64 clockval __maybe_unused;
275 struct nlattr *nest;276 struct nlattr *nest;
276 277
277 nest = nla_nest_start(skb, BRIDGE_VLANDB_GLOBAL_OPTIONS);278 nest = nla_nest_start(skb, BRIDGE_VLANDB_GLOBAL_OPTIONS);
@@ -296,6 +297,11 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, · 18 unmodified lines
296 v_opts->br_mcast_ctx.multicast_startup_query_count))297 v_opts->br_mcast_ctx.multicast_startup_query_count))
297 goto out_err;298 goto out_err;
298 299
300 clockval = jiffies_to_clock_t(v_opts->br_mcast_ctx.multicast_last_member_interval);
301 if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
302 clockval, BRIDGE_VLANDB_GOPTS_PAD))
303 goto out_err;
304
299#if IS_ENABLED(CONFIG_IPV6)305#if IS_ENABLED(CONFIG_IPV6)
300 if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,306 if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
301 v_opts->br_mcast_ctx.multicast_mld_version))307 v_opts->br_mcast_ctx.multicast_mld_version))
@@ -323,6 +329,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) · 21 unmodified lines
323 + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */329 + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */
324 + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */330 + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */
325 + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */331 + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */
332 + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */
326#endif333#endif
327 + nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */334 + nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */
328}335}
@@ -411,6 +418,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, · 82 unmodified lines
411 v->br_mcast_ctx.multicast_startup_query_count = cnt;418 v->br_mcast_ctx.multicast_startup_query_count = cnt;
412 *changed = true;419 *changed = true;
413 }420 }
421 if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]) {
422 u64 val;
423
424 val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]);
425 v->br_mcast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);
426 *changed = true;
427 }
414#if IS_ENABLED(CONFIG_IPV6)428#if IS_ENABLED(CONFIG_IPV6)
415 if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {429 if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {
416 u8 ver;430 u8 ver;
@@ -435,6 +449,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { · 18 unmodified lines
435 [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 },449 [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 },
436 [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 },450 [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 },
437 [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },451 [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },
452 [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 },
438};453};
439 454
440int br_vlan_rtm_process_global_options(struct net_device *dev,455int br_vlan_rtm_process_global_options(struct net_device *dev,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t