Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 Oct 2013 18:27:09 +0000 (14:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Oct 2013 18:27:09 +0000 (14:27 -0400)
commitd7a20c86404bb423f843d4fe34cd1d11432892a0
treeb194a2f1e2c6cba499f6b92088937c2d9e98d27a
parentccdbb6e96beca362db876d820ac1e560ff6d9579
parenta4deee1ad42d93746562fe7de2149729017e3fd1
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- ensure RecordRoute information is added to BAT_ICMP echo_request/reply only
- use VLAN_ETH_HLEN when possible
- use htons when possible
- substitute old fragmentation code with a new improved implementation by
  Martin Hundebøll
- create common header for BAT_ICMP packets to improve extendibility
- consider the network coding overhead when computing the overall room needed by
  batman headers
- add dummy soft-interface rx mode handler
- minor code refactoring and cleanups

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