The following commit has been merged in the merge/master branch: commit 6bd389c269b2f0a2e723b6bf6d10621ae413de03 Merge: 07746107415dab8f1bf89ccc21484e62e0fe2969 4aae8042b3df7ac9a74177f799cb26186623e2e7 Author: Antonio Quartulli ordex@autistici.org Date: Sat Jun 30 14:34:37 2012 +0200

Merge remote-tracking branch 'origin/standalone/next' into merge/master

diff --combined net/batman-adv/soft-interface.c index b7c655c,9e4bb61..9e4bb61 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -214,6 -214,7 +214,7 @@@ static int batadv_interface_tx(struct s

/* batman packet type: broadcast */ bcast_packet->header.packet_type = BATADV_BCAST; + bcast_packet->reserved = 0;

/* hw address of first interface is the orig mac because only * this mac is known throughout the mesh diff --combined net/batman-adv/translation-table.c index 245cc9a,a438f4b..a438f4b --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2052,6 -2052,7 +2052,7 @@@ static void batadv_send_roam_adv(struc roam_adv_packet->header.packet_type = BATADV_ROAM_ADV; roam_adv_packet->header.version = BATADV_COMPAT_VERSION; roam_adv_packet->header.ttl = BATADV_TTL; + roam_adv_packet->reserved = 0; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; diff --combined net/batman-adv/vis.c index f09cc9a,2a2ea06..2a2ea06 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -589,6 -589,7 +589,7 @@@ static int batadv_generate_vis_packet(s packet->header.ttl = BATADV_TTL; packet->seqno = htonl(ntohl(packet->seqno) + 1); packet->entries = 0; + packet->reserved = 0; skb_trim(info->skb_packet, sizeof(*packet));

if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) { @@@ -890,6 -891,7 +891,7 @@@ int batadv_vis_init(struct batadv_priv packet->header.packet_type = BATADV_VIS; packet->header.ttl = BATADV_TTL; packet->seqno = 0; + packet->reserved = 0; packet->entries = 0;

INIT_LIST_HEAD(&bat_priv->vis_send_list);