tree 4dccc4a8a0c9e3dd987f97e6474bb0e9532f4b73
parent d297653dd6f07afbe7e6c702a4bcd7615680002e
parent b6cb5ac8331b6bcfe9ce38c7f7f58db6e1d6270a
author David S. Miller <davem@davemloft.net> 1472795313 -0700
committer David S. Miller <davem@davemloft.net> 1472795350 -0700

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>