summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/hard-interface.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-09 23:56:13 +0200
committerDavid S. Miller <davem@davemloft.net>2011-06-09 23:56:13 +0200
commit6018e1183ba52735d47e8c183497d8598da75351 (patch)
tree3e9be6d850e292274ff05744ce36431492b975c7 /net/batman-adv/hard-interface.c
parentnet: emaclite: Add missing linux/interrupt.h header (diff)
parentbatman-adv: use NO_FLAGS define instead of hard-coding 0 (diff)
downloadlinux-6018e1183ba52735d47e8c183497d8598da75351.tar.xz
linux-6018e1183ba52735d47e8c183497d8598da75351.zip
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/hard-interface.c')
-rw-r--r--net/batman-adv/hard-interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 57190870d8b8..abb490106f3b 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -337,7 +337,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
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;