Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux

[deliverable/linux.git] / net / batman-adv / soft-interface.c

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 287a3879ed7e38dfd0f0d3f79e2cb2580ea84276..7527c0652dd5f8735f473595b1279dd564e9ac53 100644 (file)
--- 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"
@@ -255,7 +256,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
        if (batadv_compare_eth(ethhdr->h_dest, ectp_addr))
                goto dropped;
 
-       gw_mode = atomic_read(&bat_priv->gw_mode);
+       gw_mode = atomic_read(&bat_priv->gw.mode);
        if (is_multicast_ether_addr(ethhdr->h_dest)) {
                /* if gw mode is off, broadcast every packet */
                if (gw_mode == BATADV_GW_MODE_OFF) {
@@ -808,6 +809,10 @@ static int batadv_softif_init_late(struct net_device *dev)
        atomic_set(&bat_priv->distributed_arp_table, 1);
 #endif
 #ifdef CONFIG_BATMAN_ADV_MCAST
+       bat_priv->mcast.querier_ipv4.exists = false;
+       bat_priv->mcast.querier_ipv4.shadowing = false;
+       bat_priv->mcast.querier_ipv6.exists = false;
+       bat_priv->mcast.querier_ipv6.shadowing = false;
        bat_priv->mcast.flags = BATADV_NO_FLAGS;
        atomic_set(&bat_priv->multicast_mode, 1);
        atomic_set(&bat_priv->mcast.num_disabled, 0);
@@ -815,8 +820,8 @@ static int batadv_softif_init_late(struct net_device *dev)
        atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0);
        atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0);
 #endif
-       atomic_set(&bat_priv->gw_mode, BATADV_GW_MODE_OFF);
-       atomic_set(&bat_priv->gw_sel_class, 20);
+       atomic_set(&bat_priv->gw.mode, BATADV_GW_MODE_OFF);
+       atomic_set(&bat_priv->gw.sel_class, 20);
        atomic_set(&bat_priv->gw.bandwidth_down, 100);
        atomic_set(&bat_priv->gw.bandwidth_up, 20);
        atomic_set(&bat_priv->orig_interval, 1000);
@@ -837,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;