[linux-next] LinuxNextTracking branch, master, updated. next-20171218

batman at open-mesh.org batman at open-mesh.org
Tue Dec 19 00:16:38 CET 2017

The following commit has been merged in the master branch:
commit 974a6b20518602310637bd8ac9ad348bf8a864d6
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Dec 1 11:47:56 2017 +0100

    batman-adv: Fix kernel-doc for timer functions
    The commit e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")
    changed the argument name and type of the timer function but didn't adjust
    the kernel-doc of these functions.
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Acked-by: Kees Cook <keescook at chromium.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 15cd2139381e..ebc4e2241c77 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -482,7 +482,7 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars)
  * batadv_tp_sender_timeout - timer that fires in case of packet loss
- * @arg: address of the related tp_vars
+ * @t: address to timer_list inside tp_vars
  * If fired it means that there was packet loss.
  * Switch to Slow Start, set the ss_threshold to half of the current cwnd and
@@ -1106,7 +1106,7 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars)
  * batadv_tp_receiver_shutdown - stop a tp meter receiver when timeout is
  *  reached without received ack
- * @arg: address of the related tp_vars
+ * @t: address to timer_list inside tp_vars
 static void batadv_tp_receiver_shutdown(struct timer_list *t)


More information about the linux-merge mailing list