Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[deliverable/linux.git] / net / batman-adv / routing.h

diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 204bbe4952a6d27848f78fd932b8c077baea8382..02a5caa84127e4dc2ffb4b675cb76486bda075b0 100644 (file)
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2016  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -52,6 +52,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
                   struct batadv_orig_node *orig_node,
                   struct batadv_hard_iface *recv_if);
 int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff,
-                           unsigned long *last_reset);
+                           s32 seq_old_max_diff, unsigned long *last_reset,
+                           bool *protection_started);
 
 #endif /* _NET_BATMAN_ADV_ROUTING_H_ */