The annotated tag, batman-adv-fix-for-davem has been updated to b1e32b6e0b1e73354fe33fedc15701a2e34c20f1 (tag) from 1596a2c690161416bf47e8f1fd19f886bff76026 (which is now obsolete) tagging 2b1e2cb3594df80446dc33bb8e12230da11f38ff (commit) replaces v3.13-rc4 tagged by Antonio Quartulli on Sat Dec 28 16:56:53 2013 +0100 - Shortlog ------------------------------------------------------------ Included changes: - reset netfilter-bridge state when removing the batman-adv header from an incoming packet. This prevents netfilter bridge from being fooled when the same packet enters a bridge twice (or more): the first time within the batman-adv header and the second time without. - adjust the packet layout to prevent any architecture from adding padding bytes. All the structs sent over the wire now have size multiple of 4bytes (unless pack(2) is used). - fix access to the inner vlan_eth header when reading the VID in the rx path. Antonio Quartulli (4): batman-adv: fix size of batadv_icmp_header batman-adv: fix alignment for batadv_tvlv_tt_change batman-adv: clean nf state when removing protocol header batman-adv: fix vlan header access Simon Wunderlich (3): batman-adv: fix alignment for batadv_coded_packet batman-adv: fix header alignment by unrolling batadv_header batman-adv: fix size of batadv_bla_claim_dst ----------------------------------------------------------------------- -- linux integration