From: David S. Miller Date: Wed, 20 Dec 2017 19:33:03 +0000 (-0500) Subject: Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge X-Git-Tag: v4.16-rc1~123^2~308 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a943e8bc058977663ba1e42389d4f5643cf2ae9e;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (3 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) ==================== Signed-off-by: David S. Miller --- a943e8bc058977663ba1e42389d4f5643cf2ae9e diff --cc net/batman-adv/tp_meter.c index ebc4e2241c770,b443b9d289188..7dcf2aa4deb53 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@@ -481,8 -483,8 +483,8 @@@ static void batadv_tp_reset_sender_time } /** - * batadv_tp_sender_timeout - timer that fires in case of packet loss + * 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 @@@ -1104,9 -1107,9 +1107,9 @@@ static void batadv_tp_reset_receiver_ti } /** - * batadv_tp_receiver_shutdown - stop a tp meter receiver when timeout is + * 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) {