The following commit has been merged in the master branch: commit 6018e1183ba52735d47e8c183497d8598da75351 Merge: 075cd29e307720dfde5b67d1715a102473bf4623 ecbd532108cb21d9d3770f73e168bad65d14d9eb Author: David S. Miller davem@davemloft.net Date: Thu Jun 9 14:56:13 2011 -0700

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

diff --combined net/batman-adv/hard-interface.c index 5719087,b55e861..abb4901 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -337,7 -337,7 +337,7 @@@ int hardif_enable_interface(struct hard batman_packet = (struct batman_packet *)(hard_iface->packet_buff); batman_packet->packet_type = BAT_PACKET; batman_packet->version = COMPAT_VERSION; - batman_packet->flags = 0; + batman_packet->flags = NO_FLAGS; batman_packet->ttl = 2; batman_packet->tq = TQ_MAX_VALUE; batman_packet->num_tt = 0; @@@ -568,7 -568,7 +568,7 @@@ static int hard_if_event(struct notifie break; default: break; - }; + }

hardif_put: hardif_free_ref(hard_iface);