The following commit has been merged in the merge/master branch: commit b906204f0dfb5ff298d9499d8da3b26113eed90c Merge: 76b7062984256240ed73f97ef1b8fcc8dcd1c7a8 d4e5e0143fe81cfe804e753f9d7cc3d9e6447e86 Author: Antonio Quartulli ordex@autistici.org Date: Mon Mar 18 13:43:34 2013 +0100

Merge remote-tracking branch 'pkg/next' into merge/master

Signed-off-by: Antonio Quartulli ordex@autistici.org

Conflicts: net/batman-adv/compat.h

diff --combined net/batman-adv/network-coding.c index 5728079,086c107..086c107 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@@ -654,7 -654,7 +654,7 @@@ static bool batadv_can_nc_with_orig(str struct batadv_orig_node *orig_node, struct batadv_ogm_packet *ogm_packet) { - if (orig_node->last_real_seqno != ogm_packet->seqno) + if (orig_node->last_real_seqno != ntohl(ogm_packet->seqno)) return false; if (orig_node->last_ttl != ogm_packet->header.ttl + 1) return false; diff --combined net/batman-adv/packet.h index a079958,a51ccfc..a51ccfc --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -308,7 -308,7 +308,7 @@@ struct batadv_coded_packet uint8_t second_source[ETH_ALEN]; uint8_t second_orig_dest[ETH_ALEN]; __be32 second_crc; - uint16_t coded_len; + __be16 coded_len; };

#endif /* _NET_BATMAN_ADV_PACKET_H_ */