summaryrefslogtreecommitdiff
path: root/drivers/net/cris
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-10-31 16:18:31 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-31 16:18:31 -0400
commit17a032b7bfc0997682923509b70f9466940124bb (patch)
tree05987ec9f8f4c7bfcb2b29c59d89d6a4096fb86b /drivers/net/cris
parentf3a6f592e9873ff84cd007c2b94b32a4c178b141 (diff)
parent91b02d3d133bbb101466325cdd9a6007cd9ec5a8 (diff)
Merge branch 'bridge-PIM-hello'
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>
Diffstat (limited to 'drivers/net/cris')
0 files changed, 0 insertions, 0 deletions