* [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD size and policy
@ 2017-05-05 14:36 ` Tobias Klauser
0 siblings, 0 replies; 6+ messages in thread
From: Tobias Klauser @ 2017-05-05 14:36 UTC (permalink / raw)
To: Stephen Hemminger, David S. Miller
Cc: bridge, netdev, Nikolay Aleksandrov, Mike Manning
The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
when they were added. Do so now and also add the corresponding policy
entries:
Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Mike Manning <mmanning@brocade.com>
Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
net/bridge/br_netlink.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index a572db710d4e..c5ce7745b230 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -133,6 +133,8 @@ static inline size_t br_port_info_size(void)
+ nla_total_size(1) /* IFLA_BRPORT_MCAST_TO_UCAST */
+ nla_total_size(1) /* IFLA_BRPORT_LEARNING */
+ nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
+ + nla_total_size(1) /* IFLA_BRPORT_MCAST_FLOOD */
+ + nla_total_size(1) /* IFLA_BRPORT_BCAST_FLOOD */
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
+ nla_total_size(1) /* IFLA_BRPORT_VLAN_TUNNEL */
@@ -633,6 +635,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
[IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
[IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
+ [IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
+ [IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
};
/* Change the state of the port and notify spanning tree */
--
2.12.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD size and policy
@ 2017-05-05 14:36 ` Tobias Klauser
0 siblings, 0 replies; 6+ messages in thread
From: Tobias Klauser @ 2017-05-05 14:36 UTC (permalink / raw)
To: Stephen Hemminger, David S. Miller
Cc: Nikolay Aleksandrov, netdev, bridge, Mike Manning
The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
when they were added. Do so now and also add the corresponding policy
entries:
Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Mike Manning <mmanning@brocade.com>
Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
net/bridge/br_netlink.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index a572db710d4e..c5ce7745b230 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -133,6 +133,8 @@ static inline size_t br_port_info_size(void)
+ nla_total_size(1) /* IFLA_BRPORT_MCAST_TO_UCAST */
+ nla_total_size(1) /* IFLA_BRPORT_LEARNING */
+ nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
+ + nla_total_size(1) /* IFLA_BRPORT_MCAST_FLOOD */
+ + nla_total_size(1) /* IFLA_BRPORT_BCAST_FLOOD */
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
+ nla_total_size(1) /* IFLA_BRPORT_VLAN_TUNNEL */
@@ -633,6 +635,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
[IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
[IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
+ [IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
+ [IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
};
/* Change the state of the port and notify spanning tree */
--
2.12.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD size and policy
2017-05-05 14:36 ` [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD " Tobias Klauser
@ 2017-05-05 14:55 ` Nikolay Aleksandrov
-1 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2017-05-05 14:55 UTC (permalink / raw)
To: Tobias Klauser, Stephen Hemminger, David S. Miller
Cc: bridge, netdev, Mike Manning
On 05/05/17 17:36, Tobias Klauser wrote:
> The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
> IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
> when they were added. Do so now and also add the corresponding policy
> entries:
>
> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> Cc: Mike Manning <mmanning@brocade.com>
> Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
> Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
> net/bridge/br_netlink.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
Oops, good catch.
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD size and policy
@ 2017-05-05 14:55 ` Nikolay Aleksandrov
0 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2017-05-05 14:55 UTC (permalink / raw)
To: Tobias Klauser, Stephen Hemminger, David S. Miller
Cc: netdev, bridge, Mike Manning
On 05/05/17 17:36, Tobias Klauser wrote:
> The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
> IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
> when they were added. Do so now and also add the corresponding policy
> entries:
>
> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> Cc: Mike Manning <mmanning@brocade.com>
> Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
> Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
> net/bridge/br_netlink.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
Oops, good catch.
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD size and policy
2017-05-05 14:36 ` [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD " Tobias Klauser
@ 2017-05-05 15:22 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-05-05 15:22 UTC (permalink / raw)
To: tklauser; +Cc: stephen, bridge, netdev, nikolay, mmanning
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 5 May 2017 16:36:53 +0200
> The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
> IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
> when they were added. Do so now and also add the corresponding policy
> entries:
>
> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> Cc: Mike Manning <mmanning@brocade.com>
> Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
> Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD size and policy
@ 2017-05-05 15:22 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-05-05 15:22 UTC (permalink / raw)
To: tklauser; +Cc: netdev, bridge, nikolay, mmanning
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 5 May 2017 16:36:53 +0200
> The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and
> IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size()
> when they were added. Do so now and also add the corresponding policy
> entries:
>
> Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> Cc: Mike Manning <mmanning@brocade.com>
> Fixes: b6cb5ac8331b ("net: bridge: add per-port multicast flood flag")
> Fixes: 99f906e9ad7b ("bridge: add per-port broadcast flood flag")
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-05 15:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-05 14:36 [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD size and policy Tobias Klauser
2017-05-05 14:36 ` [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD " Tobias Klauser
2017-05-05 14:55 ` [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD " Nikolay Aleksandrov
2017-05-05 14:55 ` [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD " Nikolay Aleksandrov
2017-05-05 15:22 ` [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B,M}CAST_FLOOD " David Miller
2017-05-05 15:22 ` [Bridge] [PATCH net] bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD " David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.