---

yaml --- r: 300812 b: refs/heads/master c: 1e5cc26 h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · ce8124e · ce8124e
1 parent 7519cc9
commit ce8124e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97c72b493d7b450005f4054b15679e312c89caa
+refs/heads/master: 1e5cc266dbc401d11aefb966ad35e651c2f67414
diff --git a/trunk/net/batman-adv/bat_iv_ogm.c b/trunk/net/batman-adv/bat_iv_ogm.c
@@ -861,7 +861,8 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
 	seq_diff = batman_ogm_packet->seqno - orig_node->last_real_seqno;
 
 	/* signalize caller that the packet is to be dropped. */
-	if (window_protected(bat_priv, seq_diff,
+	if (!hlist_empty(&orig_node->neigh_list) &&
+	    window_protected(bat_priv, seq_diff,
 			     &orig_node->batman_seqno_reset))
 		goto out;