diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-16 20:05:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-16 20:05:38 +0100 |
| commit | b124f413323e90398b868a9848e63149d0fed8ce (patch) | |
| tree | cefa770d1522702c92d94869fd51a22585357e9d /net/batman-adv/soft-interface.c | |
| parent | openvswitch: Add missing case OVS_TUNNEL_KEY_ATTR_PAD (diff) | |
| parent | batman-adv: Initialize gw sel_class via batadv_algo (diff) | |
| download | linux-b124f413323e90398b868a9848e63149d0fed8ce.tar.xz linux-b124f413323e90398b868a9848e63149d0fed8ce.zip | |
Merge tag 'batadv-net-for-davem-20170316' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are two batman-adv bugfixes:
- Keep fragments equally sized, avoids some problems with too small fragments,
by Sven Eckelmann
- Initialize gateway class correctly when BATMAN V is compiled in,
by Sven Eckelmann
====================
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5d099b2e6cfc..d042c99af028 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -819,7 +819,6 @@ static int batadv_softif_init_late(struct net_device *dev) 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.bandwidth_down, 100); atomic_set(&bat_priv->gw.bandwidth_up, 20); atomic_set(&bat_priv->orig_interval, 1000); |