diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
| commit | 6018e1183ba52735d47e8c183497d8598da75351 (patch) | |
| tree | 3e9be6d850e292274ff05744ce36431492b975c7 /net/batman-adv/aggregation.c | |
| parent | 075cd29e307720dfde5b67d1715a102473bf4623 (diff) | |
| parent | ecbd532108cb21d9d3770f73e168bad65d14d9eb (diff) | |
| download | linux-6018e1183ba52735d47e8c183497d8598da75351.tar.bz2 | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/aggregation.c')
| -rw-r--r-- | net/batman-adv/aggregation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/aggregation.c b/net/batman-adv/aggregation.c index b41f25b59470..4080970ade7d 100644 --- a/net/batman-adv/aggregation.c +++ b/net/batman-adv/aggregation.c @@ -151,7 +151,7 @@ static void new_aggregated_packet(const unsigned char *packet_buff, forw_packet_aggr->own = own_packet; forw_packet_aggr->if_incoming = if_incoming; forw_packet_aggr->num_packets = 0; - forw_packet_aggr->direct_link_flags = 0; + forw_packet_aggr->direct_link_flags = NO_FLAGS; forw_packet_aggr->send_time = send_time; /* save packet direct link flag status */ |