Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / net / batman-adv / main.c

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index b0f9068ade57676b2cab4fbba034a07158378737..fb87bdc2ce9bdba9b551f90fcdcada42fdc594a4 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -107,7 +107,7 @@ int mesh_init(struct net_device *soft_iface)
        if (tt_init(bat_priv) < 1)
                goto err;
 
-       tt_local_add(soft_iface, soft_iface->dev_addr);
+       tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX);
 
        if (vis_init(bat_priv) < 1)
                goto err;
@@ -117,8 +117,6 @@ int mesh_init(struct net_device *soft_iface)
        goto end;
 
 err:
-       pr_err("Unable to allocate memory for mesh information structures: "
-              "out of mem ?\n");
        mesh_free(soft_iface);
        return -1;