tree 8b5aafe092cf6212894fc2f0176833be9b9e22ed
parent 30f3a40f9a2a2869a560a9cb9ef488d10c803e14
parent 867a59436fc35593ae0e0efcd56cc6d2f8506586
author David S. Miller <davem@davemloft.net> 1370941483 -0700
committer David S. Miller <davem@davemloft.net> 1370941483 -0700

Merge branch 'bridge_flags'

Vlad Yasevich says:

====================
The following series adds 2 new flags to bridge.  One flag allows
the user to control whether mac learning is performed on the interface
or not.  By default mac learning is on.
The other flag allows the user to control whether unicast traffic
is flooded (send without an fdb) to a given unicast port.  Default is
on.

Changes since v4:
 - Implemented Stephen's suggestions.

Changes since v2:
 - removed unused "unlock" tag.

Changes since v1:
 - Integrated suggestion from MST to not impact RTM_NEWNEIGH and to
   skip lookups when learning is disabled.

Vlad Yasevich (2):
  bridge: Add flag to control mac learning.
  bridge: Add a flag to control unicast packet flood.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>