tree b194a2f1e2c6cba499f6b92088937c2d9e98d27a
parent ccdbb6e96beca362db876d820ac1e560ff6d9579
parent a4deee1ad42d93746562fe7de2149729017e3fd1
author David S. Miller <davem@davemloft.net> 1382034429 -0400
committer David S. Miller <davem@davemloft.net> 1382034429 -0400
mergetag object a4deee1ad42d93746562fe7de2149729017e3fd1
 type commit
 tag batman-adv-for-davem
 tagger Antonio Quartulli <antonio@meshcoding.com> 1381591347 +0200
 
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCAAGBQJSWWk3AAoJEADl0hg6qKeOA7sQALZHZ6T2w1fw3VF5kgBsbtaY
 o4GC/9VWuXhJLNyqoDZ11fwohgjXDYQeXDXHBKugSbNwsjRF6nyVtfvFnb8SMCOH
 w2u8UPUkafS+AbZswj+VhnMZDpa/QRYeHV+LhgNIEQFIShZpZrAx8DNqBp8A0h17
 ifDo6wJQVfe5vZcgsxMaenxa4m/i7GUKDs34kzOFxGFWHkC0t9sPhqSz5gMhQc3j
 4jO4B3UVcuqlQBmyeR5cSe4qWW3cQEXbvv52vgsMna+H3zDznK49j4YUCAFcNenN
 Tkz6yb8JrrbJs8PCQ9ezOF1hDQJ88SmTNB3zAYiHjbxxgXdn2TlOGdw79jSVPRVL
 aDAEQfspKi79ZhiS0WZEfzjOL4r3NNcHtWnA/OHubvvoTdwK7asRTFklzvLfdC7N
 FvIFaIWDY1jwbV6fvEupDs0uKajt6H9ISBlZutWPv29JtlcDkZRdpWifF9IrSNPt
 aUHmteajS2WAJLj3RBpfmwDttZki4pLR3uJyI9hCgA+TmLGOtltTjtk2g2Lt40qn
 ytAxey+0rFmgpKCBtffmCo8k0bwPj4iWFAwXKI6SO1j6e35zZyGML1bC9COwqzZS
 EjtLMjREBw1MOdI8ZQldEX4+DZJeF2I9YzkadBfzhhnJWyAHoVEFLjgOzSe/by5p
 cnv4plUGNtxT7rdRMvnk
 =Tg/d
 -----END PGP SIGNATURE-----

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>