TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Browse Source
This commit is contained in:
David S. Miller
2012-02-28 15:07:52 -05:00
parent 5bd49735db 7c64fd98ce
commit 0695512a57
39 changed files with 141 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/batman-adv/soft-interface.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
*
@@ -396,8 +396,8 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,
&softif_neigh_vid->softif_neigh_list,
list) {
if ((!time_after(jiffies, softif_neigh->last_seen +
msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) &&
if ((!has_timed_out(softif_neigh->last_seen,
SOFTIF_NEIGH_TIMEOUT)) &&
(atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
continue;