Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300802
b: refs/heads/master
c: 8140625
h: refs/heads/master
v: v3
  • Loading branch information
Marek Lindner authored and Antonio Quartulli committed Apr 18, 2012
1 parent eb98621 commit 59838f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e88af9464f8ba6bec5a5213065ce8d98b2f2ac1a
refs/heads/master: 8140625e30523da3eb76cdab837ba7aa9509029c
8 changes: 7 additions & 1 deletion trunk/net/batman-adv/hard-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 59838f8

Please sign in to comment.