B.A.T.M.A.N March 2016

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

18 participants
70 discussions

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: use batadv_compare_eth when possible
by Sven Eckelmann 28 Mar '16

28 Mar '16

From: Antonio Quartulli <a(a)unstable.cc> When comparing Ethernet address it is better to use the more generic batadv_compare_eth. The latter is also optimised for architectures having a fast unaligned access. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Patch was resurrected from https://patchwork.open-mesh.org/patch/3668/ I've requested an rebased version at https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014639.html but done it myself because it was rather trivial. --- net/batman-adv/network-coding.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 32f9fa1..cbc667a 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -521,12 +521,10 @@ static bool batadv_nc_hash_compare(const struct hlist_node *node, nc_path2 = data2; /* Return 1 if the two keys are identical */ - if (memcmp(nc_path1->prev_hop, nc_path2->prev_hop, - sizeof(nc_path1->prev_hop)) != 0) + if (!batadv_compare_eth(nc_path1->prev_hop, nc_path2->prev_hop)) return false; - if (memcmp(nc_path1->next_hop, nc_path2->next_hop, - sizeof(nc_path1->next_hop)) != 0) + if (!batadv_compare_eth(nc_path1->next_hop, nc_path2->next_hop)) return false; return true; -- 2.7.0

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix checkpatch warning about 'unsigned' type
by Sven Eckelmann 28 Mar '16

28 Mar '16

checkpatch.pl warns about the use of 'unsigned' as a short form for 'unsigned int'. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/fragmentation.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index e6956d0..910c841 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -407,8 +407,8 @@ static struct sk_buff *batadv_frag_create(struct sk_buff *skb, unsigned int mtu) { struct sk_buff *skb_fragment; - unsigned header_size = sizeof(*frag_head); - unsigned fragment_size = mtu - header_size; + unsigned int header_size = sizeof(*frag_head); + unsigned int fragment_size = mtu - header_size; skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN); if (!skb_fragment) @@ -444,9 +444,9 @@ bool batadv_frag_send_packet(struct sk_buff *skb, struct batadv_hard_iface *primary_if = NULL; struct batadv_frag_packet frag_header; struct sk_buff *skb_fragment; - unsigned mtu = neigh_node->if_incoming->net_dev->mtu; - unsigned header_size = sizeof(frag_header); - unsigned max_fragment_size, max_packet_size; + unsigned int mtu = neigh_node->if_incoming->net_dev->mtu; + unsigned int header_size = sizeof(frag_header); + unsigned int max_fragment_size, max_packet_size; bool ret = false; /* To avoid merge and refragmentation at next-hops we never send -- 2.7.0

2 1

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: use to_delayed_work
by Geliang Tang 28 Mar '16

28 Mar '16

Use to_delayed_work() instead of open-coding it. Signed-off-by: Geliang Tang <geliangtang(a)163.com> --- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/send.c | 4 ++-- net/batman-adv/translation-table.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 99dcae3..4f47c82 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1183,7 +1183,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) struct batadv_hard_iface *primary_if; int i; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_bla = container_of(delayed_work, struct batadv_priv_bla, work); bat_priv = container_of(priv_bla, struct batadv_priv, bla); primary_if = batadv_primary_if_get_selected(bat_priv); diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index a49c705..64facfc 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -138,7 +138,7 @@ static void batadv_dat_purge(struct work_struct *work) struct batadv_priv_dat *priv_dat; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_dat = container_of(delayed_work, struct batadv_priv_dat, work); bat_priv = container_of(priv_dat, struct batadv_priv, dat); diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index f5276be..a5ffe20 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -700,7 +700,7 @@ static void batadv_nc_worker(struct work_struct *work) struct batadv_priv *bat_priv; unsigned long timeout; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_nc = container_of(delayed_work, struct batadv_priv_nc, work); bat_priv = container_of(priv_nc, struct batadv_priv, nc); diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 3c782a33..0eb5d01 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1232,7 +1232,7 @@ static void batadv_purge_orig(struct work_struct *work) struct delayed_work *delayed_work; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); bat_priv = container_of(delayed_work, struct batadv_priv, orig_work); _batadv_purge_orig(bat_priv); queue_delayed_work(batadv_event_workqueue, diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index f664324..848ce65 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -506,7 +506,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) struct net_device *soft_iface; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); soft_iface = forw_packet->if_incoming->soft_iface; @@ -559,7 +559,7 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) struct batadv_forw_packet *forw_packet; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index ec67def..ed6fcc7 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -3157,7 +3157,7 @@ static void batadv_tt_purge(struct work_struct *work) struct batadv_priv_tt *priv_tt; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_tt = container_of(delayed_work, struct batadv_priv_tt, work); bat_priv = container_of(priv_tt, struct batadv_priv, tt); -- 2.5.0

3 3

[B.A.T.M.A.N.] [PATCH 07/14] batman-adv: use list_for_each_entry_safe
by Geliang Tang 28 Mar '16

28 Mar '16

Use list_for_each_entry_safe() instead of list_for_each_safe() to simplify the code. Signed-off-by: Geliang Tang <geliangtang(a)163.com> --- net/batman-adv/icmp_socket.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index bcabb5e..841239c 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -104,25 +104,21 @@ static int batadv_socket_open(struct inode *inode, struct file *file) static int batadv_socket_release(struct inode *inode, struct file *file) { - struct batadv_socket_client *socket_client = file->private_data; - struct batadv_socket_packet *socket_packet; - struct list_head *list_pos, *list_pos_tmp; + struct batadv_socket_client *client = file->private_data; + struct batadv_socket_packet *packet, *tmp; - spin_lock_bh(&socket_client->lock); + spin_lock_bh(&client->lock); /* for all packets in the queue ... */ - list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) { - socket_packet = list_entry(list_pos, - struct batadv_socket_packet, list); - - list_del(list_pos); - kfree(socket_packet); + list_for_each_entry_safe(packet, tmp, &client->queue_list, list) { + list_del(&packet->list); + kfree(packet); } - batadv_socket_client_hash[socket_client->index] = NULL; - spin_unlock_bh(&socket_client->lock); + batadv_socket_client_hash[client->index] = NULL; + spin_unlock_bh(&client->lock); - kfree(socket_client); + kfree(client); module_put(THIS_MODULE); return 0; -- 2.5.0

4 3

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typ0 in kerneldoc
by Antonio Quartulli 28 Mar '16

28 Mar '16

Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 919a8d2..ab79f3a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -717,7 +717,7 @@ void batadv_dat_status_update(struct net_device *net_dev) } /** - * batadv_gw_tvlv_ogm_handler_v1 - process incoming dat tvlv container + * batadv_dat_tvlv_ogm_handler_v1 - process incoming dat tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags) -- 2.7.2

3 7

[B.A.T.M.A.N.] [PATCH v2] batman-adv: fix wrong names in kerneldoc
by Sven Eckelmann 28 Mar '16

28 Mar '16

From: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> [sven(a)narfation.org: Fix additional names] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - add 11 more name fixes for kernel-doc Antonio wanted to resend this patch himself [1] but this didn't happen until now. [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014624.html net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/main.h | 3 ++- net/batman-adv/multicast.c | 11 ++++++----- net/batman-adv/originator.c | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/soft-interface.c | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 642167f..f0075ff 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1576,7 +1576,7 @@ bool batadv_bla_is_backbone_gw(struct sk_buff *skb, } /** - * batadv_bla_init - free all bla structures + * batadv_bla_free - free all bla structures * @bat_priv: the bat priv with all the soft interface information * * for softinterface free or module unload diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 919a8d2..ab79f3a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -717,7 +717,7 @@ void batadv_dat_status_update(struct net_device *net_dev) } /** - * batadv_gw_tvlv_ogm_handler_v1 - process incoming dat tvlv container + * batadv_dat_tvlv_ogm_handler_v1 - process incoming dat tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags) diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 14d0013..df449a0 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -337,7 +337,7 @@ err: } /** - * batadv_socket_receive_packet - schedule an icmp packet to be sent to + * batadv_socket_add_packet - schedule an icmp packet to be sent to * userspace on an icmp socket. * @socket_client: the socket this packet belongs to * @icmph: pointer to the header of the icmp packet diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index e602408..1565df0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -296,7 +296,8 @@ static inline bool batadv_compare_eth(const void *data1, const void *data2) } /** - * has_timed_out - compares current time (jiffies) and timestamp + timeout + * batadv_has_timed_out - compares current time (jiffies) and timestamp + + * timeout * @timestamp: base value to compare with (in jiffies) * @timeout: added to base value before comparing (in milliseconds) * diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8caa2c7..c32f24f 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -394,7 +394,8 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, } /** - * batadv_mcast_want_all_ip_count - count nodes with unspecific mcast interest + * batadv_mcast_forw_want_all_ip_count - count nodes with unspecific mcast + * interest * @bat_priv: the bat priv with all the soft interface information * @ethhdr: ethernet header of a packet * @@ -433,7 +434,7 @@ batadv_mcast_forw_tt_node_get(struct batadv_priv *bat_priv, } /** - * batadv_mcast_want_forw_ipv4_node_get - get a node with an ipv4 flag + * batadv_mcast_forw_ipv4_node_get - get a node with an ipv4 flag * @bat_priv: the bat priv with all the soft interface information * * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set and @@ -460,7 +461,7 @@ batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) } /** - * batadv_mcast_want_forw_ipv6_node_get - get a node with an ipv6 flag + * batadv_mcast_forw_ipv6_node_get - get a node with an ipv6 flag * @bat_priv: the bat priv with all the soft interface information * * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set @@ -487,7 +488,7 @@ batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) } /** - * batadv_mcast_want_forw_ip_node_get - get a node with an ipv4/ipv6 flag + * batadv_mcast_forw_ip_node_get - get a node with an ipv4/ipv6 flag * @bat_priv: the bat priv with all the soft interface information * @ethhdr: an ethernet header to determine the protocol family from * @@ -511,7 +512,7 @@ batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv, } /** - * batadv_mcast_want_forw_unsnoop_node_get - get a node with an unsnoopable flag + * batadv_mcast_forw_unsnoop_node_get - get a node with an unsnoopable flag * @bat_priv: the bat priv with all the soft interface information * * Return: an orig_node which has the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e63d6a5..84d5a1e 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -289,7 +289,7 @@ void batadv_neigh_node_put(struct batadv_neigh_node *neigh_node) } /** - * batadv_orig_node_get_router - router to the originator depending on iface + * batadv_orig_router_get - router to the originator depending on iface * @orig_node: the orig node for the router * @if_outgoing: the interface where the payload packet has been received or * the OGM should be sent to diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 8a8d7ca..0796dfd 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -501,7 +501,7 @@ struct batadv_coded_packet { #pragma pack() /** - * struct batadv_unicast_tvlv - generic unicast packet with tvlv payload + * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 7679f3a..bae24c0 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -539,7 +539,7 @@ struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv, } /** - * batadv_create_vlan - allocate the needed resources for a new vlan + * batadv_softif_create_vlan - allocate the needed resources for a new vlan * @bat_priv: the bat priv with all the soft interface information * @vid: the VLAN identifier * -- 2.7.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Drop support for Linux < 3.2
by Sven Eckelmann 28 Mar '16

28 Mar '16

The Linux Kernel 2.6.32 reached its end of life [1] after over 6 years. Instead it is recommended to use at least kernel 3.2 which is also already over 3 years old. All older kernels (v2.6.29 - v3.1) should therefore be dropped to reduce the support overhead. [1] https://lkml.org/lkml/2016/3/12/78 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/atomic.h | 29 --------------- compat-include/linux/average.h | 2 -- compat-include/linux/bug.h | 51 --------------------------- compat-include/linux/compiler.h | 40 --------------------- compat-include/linux/if_vlan.h | 15 ++------ compat-include/linux/kconfig.h | 42 ---------------------- compat-include/linux/kernel.h | 29 --------------- compat-include/linux/lockdep.h | 33 ----------------- compat-include/linux/moduleparam.h | 72 -------------------------------------- compat-include/linux/netdevice.h | 57 ------------------------------ compat-include/linux/percpu.h | 48 ------------------------- compat-include/linux/printk.h | 39 --------------------- compat-include/linux/rculist.h | 10 ------ compat-include/linux/rcupdate.h | 54 ---------------------------- compat-include/linux/skbuff.h | 29 --------------- compat.h | 57 ++---------------------------- 16 files changed, 5 insertions(+), 602 deletions(-) delete mode 100644 compat-include/linux/atomic.h delete mode 100644 compat-include/linux/bug.h delete mode 100644 compat-include/linux/compiler.h delete mode 100644 compat-include/linux/kconfig.h delete mode 100644 compat-include/linux/lockdep.h delete mode 100644 compat-include/linux/moduleparam.h delete mode 100644 compat-include/linux/percpu.h delete mode 100644 compat-include/linux/printk.h delete mode 100644 compat-include/linux/rcupdate.h diff --git a/compat-include/linux/atomic.h b/compat-include/linux/atomic.h deleted file mode 100644 index fe540f9..0000000 --- a/compat-include/linux/atomic.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -#include_next <linux/atomic.h> -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ATOMIC_H_ */ diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h index 631df9b..3ce9bd7 100644 --- a/compat-include/linux/average.h +++ b/compat-include/linux/average.h @@ -22,9 +22,7 @@ #define _NET_BATMAN_ADV_COMPAT_LINUX_AVERAGE_H #include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) #include_next <linux/average.h> -#endif #include <linux/bug.h> diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h deleted file mode 100644 index 0c46158..0000000 --- a/compat-include/linux/bug.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ - -#include <linux/version.h> -#include_next <linux/bug.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#undef BUILD_BUG_ON_NOT_POWER_OF_2 -#ifdef __CHECKER__ -#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) -#else -/* Force a compilation error if a constant expression is not a power of 2 */ -#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \ - BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0)) -#endif - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#undef BUILD_BUG_ON -#ifdef __CHECKER__ -#define BUILD_BUG_ON(condition) (0) -#else /* __CHECKER__ */ -#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)])) -#endif /* __CHECKER__ */ - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_BUG_H_ */ diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h deleted file mode 100644 index 7477dcc..0000000 --- a/compat-include/linux/compiler.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ - -#include <linux/version.h> -#include_next <linux/compiler.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define __always_unused __attribute__((unused)) -#define __percpu - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#define __rcu - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h index 9423c70..4988597 100644 --- a/compat-include/linux/if_vlan.h +++ b/compat-include/linux/if_vlan.h @@ -24,21 +24,10 @@ #include <linux/version.h> #include_next <linux/if_vlan.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ -#define VLAN_PRIO_SHIFT 13 - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#define vlan_insert_tag(skb, proto, vid) __vlan_put_tag(skb, vid) - -#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) #define vlan_insert_tag(skb, proto, vid) vlan_insert_tag(skb, vid) -#endif /* < KERNEL_VERSION(3, 0, 0) */ +#endif /* < KERNEL_VERSION(3, 10, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_VLAN_H_ */ diff --git a/compat-include/linux/kconfig.h b/compat-include/linux/kconfig.h deleted file mode 100644 index d762f5a..0000000 --- a/compat-include/linux/kconfig.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -#include_next <linux/kconfig.h> -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) - -#define __ARG_PLACEHOLDER_1 0, -#define config_enabled(cfg) _config_enabled(cfg) -#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled(__ignored, val, ...) val - -#define IS_ENABLED(option) \ - (config_enabled(option) || config_enabled(option##_MODULE)) - -#endif /* < KERNEL_VERSION(3, 1, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KCONFIG_H_ */ diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h index 9e7fb10..763e383 100644 --- a/compat-include/linux/kernel.h +++ b/compat-include/linux/kernel.h @@ -24,35 +24,6 @@ #include <linux/version.h> #include_next <linux/kernel.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -#define kstrtou32(cp, base, v)\ -({\ - unsigned long _v;\ - int _r;\ - _r = strict_strtoul(cp, base, &_v);\ - *(v) = (u32)_v;\ - if ((unsigned long)*(v) != _v)\ - _r = -ERANGE;\ - _r;\ -}) - -#define kstrtou64(cp, base, v)\ -({\ - unsigned long long _v;\ - int _r;\ - _r = strict_strtoull(cp, base, &_v);\ - *(v) = (uint64_t)_v;\ - if ((unsigned long long)*(v) != _v)\ - _r = -ERANGE;\ - _r;\ -}) - -#define kstrtoul strict_strtoul -#define kstrtol strict_strtol - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) #define U8_MAX ((u8)~0U) diff --git a/compat-include/linux/lockdep.h b/compat-include/linux/lockdep.h deleted file mode 100644 index 0445083..0000000 --- a/compat-include/linux/lockdep.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ - -#include <linux/version.h> -#include_next <linux/lockdep.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) - -#define lockdep_assert_held(l) do { (void)(l); } while (0) - -#endif /* < KERNEL_VERSION(2, 6, 32) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ */ diff --git a/compat-include/linux/moduleparam.h b/compat-include/linux/moduleparam.h deleted file mode 100644 index b40abc6..0000000 --- a/compat-include/linux/moduleparam.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ - -#include <linux/version.h> -#include_next <linux/moduleparam.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p7) - -#else - -#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ - __module_param_call(p1, p2, p3, p4, p5, p6, p7) - -#endif /* < KERNEL_VERSION(2, 6, 31) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -struct kernel_param_ops { - /* Returns 0, or -errno. arg is in kp->arg. */ - int (*set)(const char *val, const struct kernel_param *kp); - /* Returns length written or -errno. Buffer is 4k (ie. be short!) */ - int (*get)(char *buffer, struct kernel_param *kp); - /* Optional function to free kp->arg when module unloaded. */ - void (*free)(void *arg); -}; - -#define module_param_cb(name, ops, arg, perm) \ - static int __compat_set_param_##name(const char *val, \ - struct kernel_param *kp) \ - { return (ops)->set(val, kp); } \ - static int __compat_get_param_##name(char *buffer, \ - struct kernel_param *kp) \ - { return (ops)->get(buffer, kp); } \ - __compat__module_param_call(MODULE_PARAM_PREFIX, name, \ - __compat_set_param_##name, \ - __compat_get_param_##name, arg, \ - __same_type((arg), bool *), perm) - -static inline int batadv_param_set_copystring(const char *val, - const struct kernel_param *kp) -{ - return param_set_copystring(val, (struct kernel_param *)kp); -} - -#define param_set_copystring batadv_param_set_copystring - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MODULEPARAM_H_ */ diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 9ff91b5..f47f5c3 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -30,58 +30,6 @@ #endif /* < KERNEL_VERSION(3, 3, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define unregister_netdevice_queue(dev, head) unregister_netdevice(dev) - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - -#include <linux/etherdevice.h> - -#undef netdev_for_each_mc_addr -#define netdev_for_each_mc_addr(mclist, dev) \ - for (mclist = (struct batadv_dev_addr_list *)dev->mc_list; mclist; \ - mclist = (struct batadv_dev_addr_list *)mclist->next) - -/* Note, that this breaks the usage of the normal 'struct netdev_hw_addr' - * for kernels < 2.6.35 in batman-adv! - */ -#define netdev_hw_addr batadv_dev_addr_list -struct batadv_dev_addr_list { - struct dev_addr_list *next; - u8 addr[MAX_ADDR_LEN]; - u8 da_addrlen; - u8 da_synced; - int da_users; - int da_gusers; -}; - -#define NETDEV_PRE_TYPE_CHANGE 0x000E -#define NETDEV_POST_TYPE_CHANGE 0x000F - -#endif /* < KERNEL_VERSION(2, 6, 35) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#define NET_ADDR_RANDOM 0 - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -/* On older kernels net_dev->master is reserved for iface bonding. */ -static inline int batadv_netdev_set_master(struct net_device *slave, - struct net_device *master) -{ - return 0; -} - -#define netdev_set_master batadv_netdev_set_master - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) @@ -103,13 +51,8 @@ static inline int batadv_netdev_set_master(struct net_device *slave, /* alloc_netdev() was defined differently before 2.6.38 */ #undef alloc_netdev -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) -#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ - alloc_netdev_mq(sizeof_priv, name, setup, 1) -#else #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) -#endif /* nested < KERNEL_VERSION(2, 6, 38) */ #endif /* < KERNEL_VERSION(3, 17, 0) */ diff --git a/compat-include/linux/percpu.h b/compat-include/linux/percpu.h deleted file mode 100644 index c37b423..0000000 --- a/compat-include/linux/percpu.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ - -#include <linux/version.h> -#include_next <linux/percpu.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - -#undef __alloc_percpu -#define __alloc_percpu(size, align) \ - percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map) - -#endif /* < KERNEL_VERSION(2, 6, 30) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define this_cpu_add(x, c) batadv_this_cpu_add(&(x), c) - -static inline void batadv_this_cpu_add(u64 *count_ptr, size_t count) -{ - int cpu = get_cpu(); - *per_cpu_ptr(count_ptr, cpu) += count; - put_cpu(); -} - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PERCPU_H_ */ diff --git a/compat-include/linux/printk.h b/compat-include/linux/printk.h deleted file mode 100644 index ecf4289..0000000 --- a/compat-include/linux/printk.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ - -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -#include_next <linux/printk.h> -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - -#define pr_warn pr_warning - -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRINTK_H_ */ - -#ifndef pr_fmt -#define pr_fmt(fmt) fmt -#endif diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h index ca17506..d432bc6 100644 --- a/compat-include/linux/rculist.h +++ b/compat-include/linux/rculist.h @@ -24,16 +24,6 @@ #include <linux/version.h> #include_next <linux/rculist.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) - -#define hlist_first_rcu(head) \ - (*((struct hlist_node __rcu **)(&(head)->first))) - -#define hlist_next_rcu(node) \ - (*((struct hlist_node __rcu **)(&(node)->next))) - -#endif /* < KERNEL_VERSION(2, 6, 37) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #undef hlist_for_each_entry_rcu diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h deleted file mode 100644 index cddf775..0000000 --- a/compat-include/linux/rcupdate.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 2007-2016 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/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ - -#include <linux/version.h> -#include_next <linux/rcupdate.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) - -#define rcu_dereference_protected(p, c) (p) - -#define rcu_dereference_raw(p) ({ \ - typeof(p) _________p1 = ACCESS_ONCE(p); \ - smp_read_barrier_depends(); \ - (_________p1); \ - }) - -#endif /* < KERNEL_VERSION(2, 6, 34) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#define kfree_rcu(ptr, rcuhead_name) \ - do { \ - void batadv_free_rcu_##ptr(struct rcu_head *rcu) \ - { \ - void *container_ptr; \ - container_ptr = container_of(rcu, typeof(*(ptr)), rcuhead_name); \ - kfree(container_ptr); \ - } \ - call_rcu(&(ptr)->rcuhead_name, batadv_free_rcu_##ptr); \ - } while (0) - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index 96b018c..b2cb161 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -24,35 +24,6 @@ #include <linux/version.h> #include_next <linux/skbuff.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) - -#define consume_skb(_skb) kfree_skb(_skb) - -#endif /* < KERNEL_VERSION(2, 6, 30) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length) -{ - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN); - - if (NET_IP_ALIGN && skb) - skb_reserve(skb, NET_IP_ALIGN); - return skb; -} - -#endif /* < KERNEL_VERSION(2, 6, 33) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -static inline void skb_reset_mac_len(struct sk_buff *skb) -{ - skb->mac_len = skb->network_header - skb->mac_header; -} - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) /* hack for not correctly set mac_len. This may happen for some special diff --git a/compat.h b/compat.h index 454fa4c..5a5f478 100644 --- a/compat.h +++ b/compat.h @@ -23,31 +23,11 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ #include <linux/kconfig.h> - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) -#include <linux/autoconf.h> -#else #include <generated/autoconf.h> -#endif -#include "compat-autoconf.h" - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - -#define skb_iif iif - -#define batadv_softif_destroy_netlink(dev, head) batadv_softif_destroy_netlink(dev) - -#endif /* < KERNEL_VERSION(2, 6, 33) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -#include <linux/netdevice.h> - -#define netdev_master_upper_dev_get_rcu(dev) \ - (dev->br_port ? dev : NULL); \ - break; +#include "compat-autoconf.h" -#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #include <linux/netdevice.h> @@ -55,38 +35,7 @@ (dev->priv_flags & IFF_BRIDGE_PORT ? dev : NULL); \ break; -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - -/* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ -#define addr_assign_type ifindex - -#endif /* < KERNEL_VERSION(2, 6, 36) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - -/* Hack for removing ndo_add/del_slave at the end of net_device_ops. - * This is somewhat ugly because it requires that ndo_validate_addr - * is at the end of this struct in soft-interface.c. - */ -#include <linux/netdevice.h> - -#define ndo_validate_addr \ - ndo_validate_addr = eth_validate_addr, \ -}; \ -static const struct { \ - void *ndo_validate_addr; \ - void *ndo_add_slave; \ - void *ndo_del_slave; \ -} __attribute__((unused)) __useless_ops1 = { \ - .ndo_validate_addr - -#define ndo_del_slave ndo_init -#define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EBUSY - -#endif /* < KERNEL_VERSION(2, 6, 39) */ - +#endif /* < KERNEL_VERSION(3, 9, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) -- 2.8.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH next] batman-adv: Update compatible kernel version number
by Sven Eckelmann 28 Mar '16

28 Mar '16

batman-adv currently only builds against official kernels >= 3.2. Older kernels (>= 2.6.29) have only incomplete compat(-include) support which will not be extended anymore. The next release will also share mostly the same code as kernel 4.6 and thus by definition is compatible with Linux 4.6. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- README.external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.external b/README.external index 833ece7..b89ce36 100644 --- a/README.external +++ b/README.external @@ -6,7 +6,7 @@ and as external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work -with Linux 2.6.29 - 4.5. Supporting older versions is not +with Linux 3.2 - 4.6. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) -- 2.8.0.rc3

2 1

[B.A.T.M.A.N.] [PATCH next] batman-adv: clarify CFG80211 dependency
by Sven Eckelmann 28 Mar '16

28 Mar '16

From: Arnd Bergmann <arnd(a)arndb.de> The driver calls cfg80211_get_station, which may be part of a module, so we must not enable BATMAN_ADV_BATMAN_V if BATMAN_ADV=y and CFG80211=m: net/built-in.o: In function `batadv_v_elp_get_throughput': (text+0x5c62c): undefined reference to `cfg80211_get_station' This clarifies the dependency to cover all combinations. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 2e0a2972e354 ("batman-adv: Depend on CFG80211 for BATMAN_V") Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Submitted for out-of-tree module with adjusted "Fixes" line. The upstream commit is fb653ebddcf871e8a83a63c1e4e73d41bc3cf599 net/batman-adv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index e651dc9..f66930e 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -17,7 +17,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" - depends on BATMAN_ADV && CFG80211 + depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m) default n help This option enables the B.A.T.M.A.N. V protocol, the successor -- 2.7.0

2 1

[B.A.T.M.A.N.] [PATCH maint v2] batman-adv: Reduce refcnt of removed router when updating route
by Sven Eckelmann 27 Mar '16

27 Mar '16

_batadv_update_route rcu_derefences orig_ifinfo->router outside of a spinlock protected region to print some information messages to the debug log. But this pointer is not checked again when the new pointer is assigned in the spinlock protected region. Thus is can happen that the value of orig_ifinfo->router changed in the meantime and thus the reference counter of the wrong router gets reduced after the spinlock protected region. Just rcu_dereferencing the value of orig_ifinfo->router inside the spinlock protected region (which also set the new pointer) is enough to get the correct old router object. Fixes: d90ddb94423f ("batman-adv: Make orig_node->router an rcu protected pointer") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> -- v2: - add comment explaining the idea behind the extra rcu_dereference_protected --- net/batman-adv/routing.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 1fb1be3..18fc4db 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -104,6 +104,13 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, neigh_node = NULL; spin_lock_bh(&orig_node->neigh_list_lock); + /* get previous best router to decrease the reference counter later. + * curr_router used earlier may not be the current orig_ifinfo->router + * because it was dereferenced outside of the neigh_list_lock protected + * region. + */ + curr_router = rcu_dereference_protected(orig_ifinfo->router, true); + rcu_assign_pointer(orig_ifinfo->router, neigh_node); spin_unlock_bh(&orig_node->neigh_list_lock); batadv_orig_ifinfo_free_ref(orig_ifinfo); -- 2.8.0.rc3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N March 2016