diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-01 22:48:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-01 22:49:10 -0700 |
| commit | 278ed676cf453ee41fe1882f872e0ec2741ee191 (patch) | |
| tree | 4dccc4a8a0c9e3dd987f97e6474bb0e9532f4b73 /include | |
| parent | d297653dd6f07afbe7e6c702a4bcd7615680002e (diff) | |
| parent | b6cb5ac8331b6bcfe9ce38c7f7f58db6e1d6270a (diff) | |
| download | linux-278ed676cf453ee41fe1882f872e0ec2741ee191.tar.gz linux-278ed676cf453ee41fe1882f872e0ec2741ee191.tar.bz2 linux-278ed676cf453ee41fe1882f872e0ec2741ee191.zip | |
Merge branch 'br-next'
Nikolay Aleksandrov says:
====================
net: bridge: add per-port unknown multicast flood control
The first patch prepares the forwarding path by having the exact packet
type passed down so we can later filter based on it and the per-port
unknown mcast flood flag introduced in the second patch. It is similar to
how the per-port unknown unicast flood flag works.
Nice side-effects of patch 01 are the slight reduction of tests in the
fast-path and a few minor checkpatch fixes.
v3: don't change br_auto_mask as that will change user-visible behaviour
v2: make pkt_type an enum as per Stephen's comment
====================
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_bridge.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/if_link.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index dcb89e3515db..c6587c01d951 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -45,6 +45,7 @@ struct br_ip_list { #define BR_PROXYARP BIT(8) #define BR_LEARNING_SYNC BIT(9) #define BR_PROXYARP_WIFI BIT(10) +#define BR_MCAST_FLOOD BIT(11) #define BR_DEFAULT_AGEING_TIME (300 * HZ) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index a1b5202c5f6b..9bf3aecfe05b 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -318,6 +318,7 @@ enum { IFLA_BRPORT_FLUSH, IFLA_BRPORT_MULTICAST_ROUTER, IFLA_BRPORT_PAD, + IFLA_BRPORT_MCAST_FLOOD, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) |