Merge branch 'bridge_multicast_exports'
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 06:51:00 +0000 (23:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 06:51:00 +0000 (23:51 -0700)
commit7b0dcbd879101e829755d1288c1b440ba1f59460
treee9690ec1d858835250edaa4cb5943bdd8e04d19e
parentc4d4c255d85310dc720c5535c164ca0f6d5b3b81
parent2cd4143192e8c60f66cb32c3a30c76d0470a372d
Merge branch 'bridge_multicast_exports'

Linus Lüssing says:

====================
bridge: multicast snooping patches / exports

The first patch is simply a cosmetic patch. So far I (and maybe others
too?) have been regularly confusing these two structs, therefore I'd
suggest renaming them and therefore making the follow-up patches easier
to understand and nicer to fit in.

The second patch fixes a minor issue, but probably not worth for stable.

On the other hand the first two patches are also preparations for the
third and fourth patch:

These two patches are exporting functionality needed to marry the bridge
multicast snooping with the batman-adv multicast optimizations recently
added for the 3.15 kernel, allowing to use these optimzations in common
setups having a bridge on top of e.g. bat0, too. So far these bridged
setups would fall back to simple flooding through the batman-adv mesh
network for any multicast packet entering bat0.

More information about the batman-adv multicast optimizations currently
implemented can be found here:

http://www.open-mesh.org/projects/batman-adv/wiki/Basic-multicast-optimizations

The integration on the batman-adv side could afterwards look like this,
for instance:

http://git.open-mesh.org/batman-adv.git/commitdiff/576b59dd3e34737c702e548b21fa72059262f796?hp=f95ce7131746c65fbcdffcf2089cab59e2c2f7ac
====================

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