Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Oct 2013 19:57:36 +0000 (15:57 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Oct 2013 19:57:36 +0000 (15:57 -0400)
commit196896d4bb297e3ff24e62b2bfc22bbed7a28431
tree4c8495abbcf9b6f769046a9b78df8588bf07504f
parent569943d0639c85a451ea853087cbd5f738247dd9
parent6c519bad7b19a2c14a075b400edabaa630330123
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Included change:
- fix multi soft-interfaces setups with Network Coding enabled by
  registering the CODED packet type once only (instead of once per soft-if)

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