batman-adv: move ogm initialization into the proper function
authorMarek Lindner <lindner_marek@yahoo.de>
Tue, 7 Feb 2012 09:19:58 +0000 (17:19 +0800)
committerAntonio Quartulli <ordex@autistici.org>
Wed, 18 Apr 2012 07:53:57 +0000 (09:53 +0200)
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
net/batman-adv/hard-interface.c

index 8c4b790b98bec99792256a02b60077f972f2e752..f15200760d6531b371b7e3568ff3193c2308b06d 100644 (file)
@@ -332,7 +332,6 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
        hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
        dev_add_pack(&hard_iface->batman_adv_ptype);
 
-       atomic_set(&hard_iface->seqno, 1);
        atomic_set(&hard_iface->frag_seqno, 1);
        bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
                 hard_iface->net_dev->name);
@@ -451,6 +450,13 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
        check_known_mac_addr(hard_iface->net_dev);
        list_add_tail_rcu(&hard_iface->list, &hardif_list);
 
+       /**
+        * This can't be called via a bat_priv callback because
+        * we have no bat_priv yet.
+        */
+       atomic_set(&hard_iface->seqno, 1);
+       hard_iface->packet_buff = NULL;
+
        return hard_iface;
 
 free_if: