aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2012-02-07 04:19:58 -0500
committerAntonio Quartulli <ordex@autistici.org>2012-04-18 03:53:57 -0400
commit8140625e30523da3eb76cdab837ba7aa9509029c (patch)
tree2ecfc26681b8834036eb8cb8e6fb6eceaea19888 /net
parente88af9464f8ba6bec5a5213065ce8d98b2f2ac1a (diff)
batman-adv: move ogm initialization into the proper function
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/hard-interface.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 8c4b790b98be..f15200760d65 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -332,7 +332,6 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
332 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev; 332 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
333 dev_add_pack(&hard_iface->batman_adv_ptype); 333 dev_add_pack(&hard_iface->batman_adv_ptype);
334 334
335 atomic_set(&hard_iface->seqno, 1);
336 atomic_set(&hard_iface->frag_seqno, 1); 335 atomic_set(&hard_iface->frag_seqno, 1);
337 bat_info(hard_iface->soft_iface, "Adding interface: %s\n", 336 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
338 hard_iface->net_dev->name); 337 hard_iface->net_dev->name);
@@ -451,6 +450,13 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
451 check_known_mac_addr(hard_iface->net_dev); 450 check_known_mac_addr(hard_iface->net_dev);
452 list_add_tail_rcu(&hard_iface->list, &hardif_list); 451 list_add_tail_rcu(&hard_iface->list, &hardif_list);
453 452
453 /**
454 * This can't be called via a bat_priv callback because
455 * we have no bat_priv yet.
456 */
457 atomic_set(&hard_iface->seqno, 1);
458 hard_iface->packet_buff = NULL;
459
454 return hard_iface; 460 return hard_iface;
455 461
456free_if: 462free_if: