Merge branch 'bridge-PIM-hello'

Browse source

Nikolay Aleksandrov says:

====================
bridge: add support for PIM hello router ports

The first 3 patches of this set do minor cleanups and add some helpers to
the PIM header file. Patch 4 adds a way to detect mcast router ports via
PIM hello messages, they're marked as temporary and are not considered for
querier. There's more detailed information in patch 4's commit message.
====================

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

...

This commit is contained in:

David S. Miller 2016-10-31 16:18:31 -04:00

parent f3a6f592e9 91b02d3d13

commit 17a032b7bf

4 changed files with 95 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

81

include/linux/pim.h

View file

22

net/bridge/br_multicast.c

View file

2

net/ipv4/ipmr.c

View file

2

net/ipv6/ip6mr.c

View file