B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

Start a nNew thread

[B.A.T.M.A.N.] [PATCH 0/6] alfred: License cleanup
by Sven Eckelmann 08 Dec '17

08 Dec '17

2 9

[B.A.T.M.A.N.] [PATCH 0/6] batctl: License cleanup
by Sven Eckelmann 06 Dec '17

06 Dec '17

1 8

[B.A.T.M.A.N.] [PATCH] batman-adv: Deinline batadv_orig_hash_find, save 7339 bytes
by Sven Eckelmann 06 Dec '17

06 Dec '17

From: Denys Vlasenko <dvlasenk(a)redhat.com> This function compiles to 288 bytes of machine code for Linux 4.14 on Debian Stretch amd64 and (6.3.0-18) with the default configuration. 27 callsites (25 used in default config). text data bss dec hex filename 179291 10317 4416 194024 2f5e8 batman-adv.ko.pre 171952 10317 4416 186685 2d93d batman-adv.ko.post Signed-off-by: Denys Vlasenko <dvlasenk(a)redhat.com> [sven(a)narfation.org: Fix includes, correct sizes+counts in commit message] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v3: - updated the statistics against Linux 4.14 v2: - fixed includes - updated statistics for Debian's 4.6.0-1-amd64 - extended commit message v1: - initial version from Denys Vlasenko Comparison was done using Linux 4.14 on Debian Stretch on amd64 make defconfig cat >> .config << EOF CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BATMAN_V=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_DEBUGFS=y CONFIG_BATMAN_ADV_DEBUG=y EOF make olddefconfig make -j9 My tests with some MIPS based acesspoints didn't show any performance reductions. https://patchwork.open-mesh.org/patch/15968/ --- net/batman-adv/originator.c | 32 ++++++++++++++++++++++++++++++++ net/batman-adv/originator.h | 37 ++----------------------------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 4018ecba..beb168b1 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -33,10 +33,12 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/rculist.h> +#include <linux/rcupdate.h> #include <linux/seq_file.h> #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/stddef.h> #include <linux/workqueue.h> #include <net/sock.h> #include <uapi/linux/batman_adv.h> @@ -58,6 +60,36 @@ /* hash class keys */ static struct lock_class_key batadv_orig_hash_lock_class_key; +struct batadv_orig_node * +batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data) +{ + struct batadv_hashtable *hash = bat_priv->orig_hash; + struct hlist_head *head; + struct batadv_orig_node *orig_node, *orig_node_tmp = NULL; + int index; + + if (!hash) + return NULL; + + index = batadv_choose_orig(data, hash->size); + head = &hash->table[index]; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, head, hash_entry) { + if (!batadv_compare_eth(orig_node, data)) + continue; + + if (!kref_get_unless_zero(&orig_node->refcount)) + continue; + + orig_node_tmp = orig_node; + break; + } + rcu_read_unlock(); + + return orig_node_tmp; +} + static void batadv_purge_orig(struct work_struct *work); /** diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 220c12f2..0e0a12e6 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -26,14 +26,8 @@ #include <linux/compiler.h> #include <linux/if_ether.h> #include <linux/jhash.h> -#include <linux/kref.h> -#include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/stddef.h> #include <linux/types.h> -#include "hash.h" - struct netlink_callback; struct seq_file; struct sk_buff; @@ -103,34 +97,7 @@ static inline u32 batadv_choose_orig(const void *data, u32 size) return hash % size; } -static inline struct batadv_orig_node * -batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data) -{ - struct batadv_hashtable *hash = bat_priv->orig_hash; - struct hlist_head *head; - struct batadv_orig_node *orig_node, *orig_node_tmp = NULL; - int index; - - if (!hash) - return NULL; - - index = batadv_choose_orig(data, hash->size); - head = &hash->table[index]; - - rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - if (!batadv_compare_eth(orig_node, data)) - continue; - - if (!kref_get_unless_zero(&orig_node->refcount)) - continue; - - orig_node_tmp = orig_node; - break; - } - rcu_read_unlock(); - - return orig_node_tmp; -} +struct batadv_orig_node * +batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data); #endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */ -- 2.11.0

1 1

[B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup
by Sven Eckelmann 06 Dec '17

06 Dec '17

Hi, the kernel community is currently trying to make the licensing status more clear in each file. This is mostly done by adding SPDX license identifiers and defining a set of rules how these license related information has to be stored. I've used this opportunity to go through all files (for example with FSFE's `reuse lint`) and to annotate the files according to the "Linux licensing rules" and FSFE's REUSE practices. There are two things which could be seen as controversial: * change of batman_adv.h to the Linux preferred license (I am waiting for Acks) * explicitly mark remaining files as licensed under the GPL-2.0 Kind regards, Sven Sven Eckelmann (9): batman-adv: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0 batman-adv: Add License-Filename to GPL-2.0 files batman-adv: Add SPDX license identifier above copyright header batman-adv: Add SPDX license identifier to batman-adv.rst batman-adv: Add license header to Kconfig batman-adv: Add license headers to compat files batman-adv: Mark remaining files as GPL-2.0 batman-adv: Change batman_adv.h license to MIT batman-adv: Import Linux's LICENSES/preferred/MIT .gitattributes | 3 + CHANGELOG.license | 2 + Documentation/networking/batman-adv.rst | 2 + LICENSES/preferred/GPL-2.0 | 352 ++++++++++++++++++++++++++++++++ LICENSES/preferred/MIT | 30 +++ MAINTAINERS.license | 2 + Makefile | 3 +- README.external.license | 2 + compat-include/linux/average.h | 3 + compat-include/linux/cache.h | 3 + compat-include/linux/etherdevice.h | 3 + compat-include/linux/ethtool.h | 3 + compat-include/linux/export.h | 3 + compat-include/linux/genetlink.h | 3 + compat-include/linux/if_bridge.h | 23 +++ compat-include/linux/if_ether.h | 3 + compat-include/linux/if_vlan.h | 3 + compat-include/linux/igmp.h | 23 +++ compat-include/linux/kernel.h | 3 + compat-include/linux/kref.h | 3 + compat-include/linux/list.h | 3 + compat-include/linux/net.h | 3 + compat-include/linux/netdev_features.h | 3 + compat-include/linux/netdevice.h | 3 + compat-include/linux/netlink.h | 3 + compat-include/linux/nl80211.h | 23 +++ compat-include/linux/random.h | 3 + compat-include/linux/rculist.h | 3 + compat-include/linux/seq_file.h | 3 + compat-include/linux/skbuff.h | 3 + compat-include/linux/slab.h | 3 + compat-include/net/addrconf.h | 23 +++ compat-include/net/cfg80211.h | 23 +++ compat-include/net/genetlink.h | 3 + compat-include/net/ip6_checksum.h | 23 +++ compat-include/net/ipv6.h | 23 +++ compat-include/uapi/linux/nl80211.h | 23 +++ compat-patches/README | 2 + compat-patches/replacements.sh | 18 ++ compat-sources/Makefile | 19 ++ compat-sources/net/core/skbuff.c | 3 + compat-sources/net/ipv4/igmp.c | 3 + compat-sources/net/ipv6/mcast_snoop.c | 3 + compat.h | 3 + gen-compat-autoconf.sh | 18 ++ include/uapi/linux/batman_adv.h | 27 ++- net/batman-adv/Kconfig | 19 ++ net/batman-adv/Makefile | 3 +- net/batman-adv/bat_algo.c | 3 + net/batman-adv/bat_algo.h | 3 + net/batman-adv/bat_iv_ogm.c | 3 + net/batman-adv/bat_iv_ogm.h | 3 + net/batman-adv/bat_v.c | 3 + net/batman-adv/bat_v.h | 3 + net/batman-adv/bat_v_elp.c | 3 + net/batman-adv/bat_v_elp.h | 3 + net/batman-adv/bat_v_ogm.c | 3 + net/batman-adv/bat_v_ogm.h | 3 + net/batman-adv/bitarray.c | 3 + net/batman-adv/bitarray.h | 3 + net/batman-adv/bridge_loop_avoidance.c | 3 + net/batman-adv/bridge_loop_avoidance.h | 3 + net/batman-adv/debugfs.c | 3 + net/batman-adv/debugfs.h | 3 + net/batman-adv/distributed-arp-table.c | 3 + net/batman-adv/distributed-arp-table.h | 3 + net/batman-adv/fragmentation.c | 3 + net/batman-adv/fragmentation.h | 3 + net/batman-adv/gateway_client.c | 3 + net/batman-adv/gateway_client.h | 3 + net/batman-adv/gateway_common.c | 3 + net/batman-adv/gateway_common.h | 3 + net/batman-adv/hard-interface.c | 3 + net/batman-adv/hard-interface.h | 3 + net/batman-adv/hash.c | 3 + net/batman-adv/hash.h | 3 + net/batman-adv/icmp_socket.c | 3 + net/batman-adv/icmp_socket.h | 3 + net/batman-adv/log.c | 3 + net/batman-adv/log.h | 3 + net/batman-adv/main.c | 3 + net/batman-adv/main.h | 3 + net/batman-adv/multicast.c | 3 + net/batman-adv/multicast.h | 3 + net/batman-adv/netlink.c | 3 + net/batman-adv/netlink.h | 3 + net/batman-adv/network-coding.c | 3 + net/batman-adv/network-coding.h | 3 + net/batman-adv/originator.c | 3 + net/batman-adv/originator.h | 3 + net/batman-adv/packet.h | 3 + net/batman-adv/routing.c | 3 + net/batman-adv/routing.h | 3 + net/batman-adv/send.c | 3 + net/batman-adv/send.h | 3 + net/batman-adv/soft-interface.c | 3 + net/batman-adv/soft-interface.h | 3 + net/batman-adv/sysfs.c | 3 + net/batman-adv/sysfs.h | 3 + net/batman-adv/tp_meter.c | 3 + net/batman-adv/tp_meter.h | 3 + net/batman-adv/translation-table.c | 3 + net/batman-adv/translation-table.h | 3 + net/batman-adv/tvlv.c | 3 + net/batman-adv/tvlv.h | 3 + net/batman-adv/types.h | 3 + 106 files changed, 923 insertions(+), 12 deletions(-) create mode 100644 CHANGELOG.license create mode 100644 LICENSES/preferred/GPL-2.0 create mode 100644 LICENSES/preferred/MIT create mode 100644 MAINTAINERS.license create mode 100644 README.external.license -- 2.11.0

5 17

[B.A.T.M.A.N.] [PATCH 0/6] batman-adv: Include cleanup
by Sven Eckelmann 06 Dec '17

06 Dec '17

Hi, I went through the build_test.git's testhelpers/kernel_mappings.iwyu and cleaned that up a little bit. This requires that we have to adjust the batman-adv sources slighty. I have also found a build problem when you try to build B.A.T.M.A.N. V against Linux < 3.7 and fixed it in the same patchset. Kind regards, Sven Sven Eckelmann (6): batman-adv: include gfp.h for GFP_* defines batman-adv: include build_bug.h for BUILD_BUG_ON define batman-adv: Include net.h for net_ratelimited_function batman-adv: include kobject.h for kobject_* functions batman-adv: Remove unused sched.h include batman-adv: compat: Map to linux/nl80211.h for Linux < 3.7 compat-include/linux/build_bug.h | 34 ++++++++++++++++++++++++++++++++++ compat-include/uapi/linux/nl80211.h | 4 ++++ net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_ogm.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/debugfs.c | 1 - net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/icmp_socket.c | 1 + net/batman-adv/log.c | 1 + net/batman-adv/main.c | 4 ++-- net/batman-adv/multicast.c | 2 +- net/batman-adv/netlink.c | 2 +- net/batman-adv/network-coding.c | 3 ++- net/batman-adv/originator.c | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/sysfs.c | 3 ++- net/batman-adv/tp_meter.c | 4 ++-- net/batman-adv/translation-table.c | 5 +++-- net/batman-adv/tvlv.c | 2 +- 25 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 compat-include/linux/build_bug.h -- 2.11.0

1 7

[B.A.T.M.A.N.] [PATCH 0/8] batman-adv: kernel-doc enhancements
by Sven Eckelmann 06 Dec '17

06 Dec '17

Hi, more and more functions/struct/enums/... in batman-adv have at least some brief documentation. But there were still some externally visible (as "visible" in other source files) elements which completely missed any kind of kernel-doc. Accoring to the kernel-doc dicumentation [1], having these documented "properly" is currently a goal. This patchset now tries to unify the formatting slightly and then add more (brief) documentation to these elements. Kind regards, Sven [1] https://www.kernel.org/doc/html/v4.14/doc-guide/kernel-doc.html#recommendat… Sven Eckelmann (8): batman-adv: Add missing kernel-doc to packet.h batman-adv: Use parentheses in function kernel-doc batman-adv: Use inline kernel-doc for enum/struct batman-adv: Fix kernel-doc references to struct members batman-adv: Add kernel-doc to structs in headers batman-adv: Add kernel-doc to enums in headers batman-adv: Add kernel-doc to functions in headers batman-adv: Add kernel-doc to externally visible functions net/batman-adv/bat_algo.c | 34 +- net/batman-adv/bat_iv_ogm.c | 102 +- net/batman-adv/bat_v.c | 48 +- net/batman-adv/bat_v_elp.c | 24 +- net/batman-adv/bat_v_ogm.c | 34 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 9 +- net/batman-adv/bridge_loop_avoidance.c | 109 +- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/debugfs.c | 28 +- net/batman-adv/distributed-arp-table.c | 77 +- net/batman-adv/distributed-arp-table.h | 6 +- net/batman-adv/fragmentation.c | 20 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 62 +- net/batman-adv/gateway_common.c | 27 +- net/batman-adv/gateway_common.h | 5 +- net/batman-adv/hard-interface.c | 62 +- net/batman-adv/hard-interface.h | 58 +- net/batman-adv/hash.c | 17 +- net/batman-adv/hash.h | 27 +- net/batman-adv/icmp_socket.c | 13 +- net/batman-adv/log.c | 17 + net/batman-adv/log.h | 61 +- net/batman-adv/main.c | 47 +- net/batman-adv/main.h | 120 +- net/batman-adv/multicast.c | 78 +- net/batman-adv/multicast.h | 16 +- net/batman-adv/netlink.c | 22 +- net/batman-adv/network-coding.c | 120 +- net/batman-adv/originator.c | 119 +- net/batman-adv/originator.h | 9 +- net/batman-adv/packet.h | 25 +- net/batman-adv/routing.c | 53 +- net/batman-adv/send.c | 63 +- net/batman-adv/send.h | 4 +- net/batman-adv/soft-interface.c | 61 +- net/batman-adv/sysfs.c | 52 +- net/batman-adv/sysfs.h | 13 + net/batman-adv/tp_meter.c | 70 +- net/batman-adv/translation-table.c | 226 ++-- net/batman-adv/tvlv.c | 38 +- net/batman-adv/types.h | 1992 ++++++++++++++++++++++---------- 43 files changed, 2694 insertions(+), 1282 deletions(-) -- 2.11.0

1 9

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
by Sven Eckelmann 04 Dec '17

04 Dec '17

The originator node object orig_neigh_node is used to when accessing the bcast_own(_sum) and real_packet_count information. The access to them has to be protected with the spinlock in orig_neigh_node. But the function uses the lock in orig_node instead. This is incorrect because they could be two different originator node objects. Fixes: f14416760b62 ("batman-adv: protect bit operations to count OGMs with spinlock") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- WARNING: This is only compile tested Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Linus Lüssing <linus.luessing(a)c0d3.blue> --- net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1b659ab6..bbe8414b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1214,7 +1214,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, orig_node->last_seen = jiffies; /* find packet count of corresponding one hop neighbor */ - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); if_num = if_incoming->if_num; orig_eq_count = orig_neigh_node->bat_iv.bcast_own_sum[if_num]; neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing); @@ -1224,7 +1224,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, } else { neigh_rq_count = 0; } - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + spin_unlock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); /* pay attention to not get a value bigger than 100 % */ if (orig_eq_count > neigh_rq_count) -- 2.11.0

2 1

[B.A.T.M.A.N.] [PATCH] batctl: Handle allocation error in vlan_get_link_parse
by Sven Eckelmann 04 Dec '17

04 Dec '17

The malloc could fail and return NULL. In this case, the processing of the current interface index has to be stopped to avoid writing to NULL (which would cause a segfault). Fixes: d29288fe0583 ("batctl: implement vlan-to-link helper functions") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- functions.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions.c b/functions.c index 8bcf52d..5e4eda0 100644 --- a/functions.c +++ b/functions.c @@ -812,6 +812,9 @@ static int vlan_get_link_parse(struct nl_msg *msg, void *arg) idx = *(int *)nla_data(tb[IFLA_LINK]); free(nl_arg->iface); nl_arg->iface = malloc(IFNAMSIZ + 1); + if (!nl_arg->iface) + goto err; + if (!if_indextoname(idx, nl_arg->iface)) goto err; -- 2.11.0

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: setup_timer() -> timer_setup()
by Sven Eckelmann 01 Dec '17

01 Dec '17

From: Kees Cook <keescook(a)chromium.org> This converts all remaining cases of the old setup_timer() API into using timer_setup(), where the callback argument is the structure already holding the struct timer_list. These should have no behavioral changes, since they just change which pointer is passed into the callback with the same available pointers after conversion. Signed-off-by: Kees Cook <keescook(a)chromium.org> [sven(a)narfation.org: removed spatch and examples, added compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/timer.h | 59 ++++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/tp_meter.c | 14 +++++------ 2 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 compat-include/linux/timer.h diff --git a/compat-include/linux/timer.h b/compat-include/linux/timer.h new file mode 100644 index 0000000..750b6ae --- /dev/null +++ b/compat-include/linux/timer.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * License-Filename: LICENSES/preferred/GPL-2.0 + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H +#define _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H + +#include <linux/version.h> +#include_next <linux/timer.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) + +#define __setup_timer(_timer, _fn, _data, _flags) \ + do { \ + init_timer(_timer); \ + (_timer)->function = (_fn); \ + (_timer)->data = (_data); \ + } while (0) + +#endif /* < KERNEL_VERSION(3, 7, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + +#define TIMER_DATA_TYPE unsigned long +#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) + +static inline void timer_setup(struct timer_list *timer, + void (*callback)(struct timer_list *), + unsigned int flags) +{ + __setup_timer(timer, (TIMER_FUNC_TYPE)callback, + (TIMER_DATA_TYPE)timer, flags); +} + +#define from_timer(var, callback_timer, timer_fieldname) \ + container_of(callback_timer, typeof(*var), timer_fieldname) + +#endif /* < KERNEL_VERSION(4, 14, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H */ diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 4b90033..15cd213 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -488,9 +488,9 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars) * Switch to Slow Start, set the ss_threshold to half of the current cwnd and * reset the cwnd to 3*MSS */ -static void batadv_tp_sender_timeout(unsigned long arg) +static void batadv_tp_sender_timeout(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_priv *bat_priv = tp_vars->bat_priv; if (atomic_read(&tp_vars->sending) == 0) @@ -1020,8 +1020,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, atomic64_set(&tp_vars->tot_sent, 0); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_sender_timeout, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_sender_timeout, 0); tp_vars->bat_priv = bat_priv; tp_vars->start_time = jiffies; @@ -1109,9 +1108,9 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars) * reached without received ack * @arg: address of the related tp_vars */ -static void batadv_tp_receiver_shutdown(unsigned long arg) +static void batadv_tp_receiver_shutdown(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_tp_unacked *un, *safe; struct batadv_priv *bat_priv; @@ -1373,8 +1372,7 @@ batadv_tp_init_recv(struct batadv_priv *bat_priv, hlist_add_head_rcu(&tp_vars->list, &bat_priv->tp_list); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_receiver_shutdown, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_receiver_shutdown, 0); batadv_tp_reset_receiver_timer(tp_vars); -- 2.11.0

4 4

[B.A.T.M.A.N.] [PATCH 0/3] batman-adv: Convert CHANGELOG/README to reStructuredText
by Sven Eckelmann 01 Dec '17

01 Dec '17

Hi, I was talking today with Simon about the "License cleanup" changes. He would prefer when the *.license files don't exist (when possible). Luckily, I already wanted to convert these files (or at least the READMEs) to reStructuredText and I've already shown in these patchsets how the SPDX annotation should be done for the lrest files. So it was just logically to immediately post the conversion to rst and integration of this tag. We've also discussed how the changelog should look like. It should be simple and we only wanted to show the date (not the time) anymore. And the actual changelog lists should be kept (mostly untouched - beside some minor format fixes to make it reStructuredText compatible). This patchset is based on the "batman-adv: License cleanup" patchset. Kind regards, Sven Sven Eckelmann (3): batman-adv: Add .rst to README symlink batman-adv: Convert CHANGELOG to reStructuredText batman-adv: Convert README to reStructuredText CHANGELOG | 634 --------------------------------------------- CHANGELOG.license | 2 - CHANGELOG.rst | 666 ++++++++++++++++++++++++++++++++++++++++++++++++ README.external | 51 ---- README.external.license | 2 - README.external.rst | 59 +++++ README => README.rst | 0 7 files changed, 725 insertions(+), 689 deletions(-) delete mode 100644 CHANGELOG delete mode 100644 CHANGELOG.license create mode 100644 CHANGELOG.rst delete mode 100644 README.external delete mode 100644 README.external.license create mode 100644 README.external.rst rename README => README.rst (100%) -- 2.11.0

1 5

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N