diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-05 09:33:59 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-05 09:33:59 +0300 |
| commit | b77af26a790a2ecfdd4109a3b1328499ea988181 (patch) | |
| tree | 6e192798c8d05bfc04d27aa94dc51a6407801c63 /net/batman-adv/soft-interface.c | |
| parent | 5ee389751922a497d38c4750c5cbe6223873c24c (diff) | |
| parent | 29824a55c07cd79a530d4bc1020a529c402515b6 (diff) | |
| download | linux-b77af26a790a2ecfdd4109a3b1328499ea988181.tar.xz | |
Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- Cleanup work by Markus Pargmann and Sven Eckelmann (six patches)
- Initial Netlink support by Matthias Schiffer (two patches)
- Throughput Meter implementation by Antonio Quartulli, a kernel-space
traffic generator to estimate link speeds. This feature is useful on
low-end WiFi APs where running iperf or netperf from userspace
gives wrong results due to heavy userspace/kernelspace overhead.
(two patches)
- API clean-up work by Antonio Quartulli (one patch)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 4ba894ca8b2a..7527c0652dd5 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -48,6 +48,7 @@ #include <linux/types.h> #include <linux/workqueue.h> +#include "bat_algo.h" #include "bridge_loop_avoidance.h" #include "debugfs.h" #include "distributed-arp-table.h" @@ -841,6 +842,8 @@ static int batadv_softif_init_late(struct net_device *dev) #ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bla.num_requests, 0); #endif + atomic_set(&bat_priv->tp_num, 0); + bat_priv->tt.last_changeset = NULL; bat_priv->tt.last_changeset_len = 0; bat_priv->isolation_mark = 0; |