ipvs: convert lblcr scheduler to rcu

[karo-tx-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 2711e870f557d43ac6bbd4180a7f239a27fb850a..f93ae42abb587af5c402bc947642d9c1dad186de 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -37,6 +37,7 @@
 #include <linux/if_ether.h>
 #include "unicast.h"
 #include "bridge_loop_avoidance.h"
+#include "network-coding.h"
 
 
 static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
@@ -544,6 +545,8 @@ struct net_device *batadv_softif_create(const char *name)
        if (ret < 0)
                goto unreg_soft_iface;
 
+       batadv_nc_init_bat_priv(bat_priv);
+
        ret = batadv_sysfs_add_meshif(soft_iface);
        if (ret < 0)
                goto unreg_soft_iface;
@@ -662,6 +665,17 @@ static const struct {
        { "dat_put_rx" },
        { "dat_cached_reply_tx" },
 #endif
+#ifdef CONFIG_BATMAN_ADV_NC
+       { "nc_code" },
+       { "nc_code_bytes" },
+       { "nc_recode" },
+       { "nc_recode_bytes" },
+       { "nc_buffer" },
+       { "nc_decode" },
+       { "nc_decode_bytes" },
+       { "nc_decode_failed" },
+       { "nc_sniffed" },
+#endif
 };
 
 static void batadv_get_strings(struct net_device *dev, uint32_t stringset,