B.A.T.M.A.N January 2016

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

13 participants
50 discussions

[B.A.T.M.A.N.] pull request [net]: batman-adv 20160114
by Antonio Quartulli 13 Jan '16

13 Jan '16

Hello David, these are two small fixes intended for your net tree. Patch 1 prevents a lockdep splat from appearing along the shutdown path due to a missing lock in mcast_free(), by Simon Wunderlich. Patch 2 fixes a new feature introduced in 4.5 by ensuring that a batadv_hardif_neigh_node object is free'd only when it is no longer used in any context, by Sven Eckelmann. Please pull or let me know of any issue. Thanks a lot, Antonio The following changes since commit f1640c3ddeec12804bc9a21feee85fc15aca95f6: bgmac: fix a missing check for build_skb (2016-01-13 00:24:14 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to bab7c6c3deac70966a3000402c0ea6d0c20edd15: batman-adv: Fix list removal of batadv_hardif_neigh_node (2016-01-13 19:28:27 +0800) ---------------------------------------------------------------- Included bugfixes: - avoid freeing batadv_hardif_neigh_node when still in use in other contexts - prevent lockdep splat in mcast_free during shutdown ---------------------------------------------------------------- Simon Wunderlich (1): batman-adv: fix lockdep splat when doing mcast_free Sven Eckelmann (1): batman-adv: Fix list removal of batadv_hardif_neigh_node net/batman-adv/multicast.c | 2 ++ net/batman-adv/originator.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

2 3

[B.A.T.M.A.N.] Fwd: [Battlemesh] Battlemesh v9 announcement
by Simon Wunderlich 12 Jan '16

12 Jan '16

Hey guys, I'm sure there are quite a lot of batman users who might find this even interesting - most of the batman devs will be there, personally, too. :) Cheers, Simon ---------- Forwarded Message ---------- Subject: [Battlemesh] Battlemesh v9 announcement Date: Tuesday 12 January 2016, 22:04:41 From: Simon Wunderlich <sw(a)simonwunderlich.de> To: battlemesh(a)ml.ninux.org Here is the announcement in text form, please forward it to mailing lists, friends, colleagues, even your arch enemies. :) ========================================================== Announcing the Wireless Battle Mesh v9 (1st - 7th of May 2016, Porto, Portugal) ========================================================== The next 'Wireless Battle of the Mesh' will take place from Sun 1st till Sat 7th of May at Faculty of Engineering of University of Porto, Porto, Portugal. The event aims to bring together people from across the globe to test the performance of different routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX, OLSR, and 802.11s. Of course, new protocols (working on OpenWRT) are always welcome! It is not required to be active within the mentioned protocols, so if you are a mesh networking enthusiast, community networking activist, or have an interest in mesh networks in general, you have to check this out! Information about the event is gathered at: http://battlemesh.org/BattleMeshV9 Location ======== The event takes place at the Faculty of Engineering of the University of Porto, Porto, Portugal. It features one large meeting room with three distinct areas: a working space, with tables and Internet connection, a conference space for talks, and a small kitchen. The room is located centrally in the campus and has a large grass area outside. The department buildings will be used to deploy the wireless routers across the common spaces, labs and meeting rooms. Participant Registration and Fee ================================ The event itself is free of charge and open for all. If you wish low cost accommodation, a special group booking has been arranged. Payment in advance is required to get the full benefit of the discount. Therefore, like for the previous event, this year's edition features an "early bird low cost" registration program with two accommodation options (6 nights with the breakfast included). Payment instructions will be given after filling the registration form. Of course, this package is not compulsory. You can also find your own bed and food supply yourself during the event if you wish to do so. If you want to join the event, whether with the accommodation package or without, please always register using the registration form: http://goo.gl/forms/irXcErZ2N9 For any additional information, requests and inquiries get in touch with the local organization team: v9 at battlemesh.org The following accommodation options are available: Rivoli Cinema Hostel ------------- Rivoli Cinema Hostel is the first Cinema themed Hostel in Portugal. It has 12 rooms available (3 beds and 4 beds room), 6 shared toilets and 6 shared showers, a fully equipped kitchen, 1 lounge area where you can relax, have a drink, read books and play games, and an outside 180 m2 space where you can listen to music, barbecue, sunbath, party, or just chat with the others guests. The breakfast and the towel is included in the price. The hostel is right next to the main city square, and 15-20 minutes to the battlemesh venue by Metro. Porto Spot Hostel ------------- Located in Portoâs city centre, Porto Spot Hostel offers comfortable 3 beds and 4 beds rooms with free WiFi. It is only a 5-minute walk from the Trindade Metro Station and 15 minutes to the battlemesh venue by metro. Early bird booking is available for 6 nights (May 1st to 7th) for 125 EUR if payment is received before Feb 1st. The price goes up to 150 EUR for all later payments. Our reservations are valid until March 1st, any late arrangements are subject to availability. Spread the Word =============== Feel free to spread the word by forwarding this mail to all lists / people that might be interested in it. Blogging about the event is more than welcome, and if you do so, please add a ping-back to the wiki page: http://battlemesh.org/BattleMeshV9 Contact ======= * Web: http://battlemesh.org/BattleMeshV9 * Email: http://ml.ninux.org/mailman/listinfo/battlemesh * IRC: irc.freenode.net #battlemesh -----------------------------------------

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: remove whitespace from copyright line
by Antonio Quartulli 12 Jan '16

12 Jan '16

A whitespace has been accidentally added while updating the copyright years in the file headers. Remove it. Fixes: ee0e93f52a34 ("batman-adv: update copyright years for 2016") Cc: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- Makefile | 2 +- compat-include/linux/atomic.h | 2 +- compat-include/linux/bug.h | 2 +- compat-include/linux/compiler.h | 2 +- compat-include/linux/etherdevice.h | 2 +- compat-include/linux/export.h | 2 +- compat-include/linux/if_ether.h | 2 +- compat-include/linux/if_vlan.h | 2 +- compat-include/linux/kconfig.h | 2 +- compat-include/linux/kernel.h | 2 +- compat-include/linux/list.h | 2 +- compat-include/linux/lockdep.h | 2 +- compat-include/linux/moduleparam.h | 2 +- compat-include/linux/net.h | 2 +- compat-include/linux/netdev_features.h | 2 +- compat-include/linux/netdevice.h | 2 +- compat-include/linux/percpu.h | 2 +- compat-include/linux/printk.h | 2 +- compat-include/linux/random.h | 2 +- compat-include/linux/rculist.h | 2 +- compat-include/linux/rcupdate.h | 2 +- compat-include/linux/seq_file.h | 2 +- compat-include/linux/skbuff.h | 2 +- compat-include/linux/slab.h | 2 +- compat.h | 2 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/multicast.h | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/network-coding.h | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index 5865f89..e31c04b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/compat-include/linux/atomic.h b/compat-include/linux/atomic.h index fe540f9..5f254fe 100644 --- a/compat-include/linux/atomic.h +++ b/compat-include/linux/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h index 124fd28..a8b9508 100644 --- a/compat-include/linux/bug.h +++ b/compat-include/linux/bug.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index 7477dcc..8d47375 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h index f120202..d69caf2 100644 --- a/compat-include/linux/etherdevice.h +++ b/compat-include/linux/etherdevice.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h index c43b35b..b69509d 100644 --- a/compat-include/linux/export.h +++ b/compat-include/linux/export.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/if_ether.h b/compat-include/linux/if_ether.h index 79c8526..fcf7f55 100644 --- a/compat-include/linux/if_ether.h +++ b/compat-include/linux/if_ether.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h index 9423c70..28233a9 100644 --- a/compat-include/linux/if_vlan.h +++ b/compat-include/linux/if_vlan.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/kconfig.h b/compat-include/linux/kconfig.h index d762f5a..bf5d8bf 100644 --- a/compat-include/linux/kconfig.h +++ b/compat-include/linux/kconfig.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h index 9e7fb10..5ffec9a 100644 --- a/compat-include/linux/kernel.h +++ b/compat-include/linux/kernel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h index c7f07f1..014242a 100644 --- a/compat-include/linux/list.h +++ b/compat-include/linux/list.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/lockdep.h b/compat-include/linux/lockdep.h index 0445083..98bd41c 100644 --- a/compat-include/linux/lockdep.h +++ b/compat-include/linux/lockdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/moduleparam.h b/compat-include/linux/moduleparam.h index b40abc6..c61098b 100644 --- a/compat-include/linux/moduleparam.h +++ b/compat-include/linux/moduleparam.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/net.h b/compat-include/linux/net.h index 0301ca0..65d9c7d 100644 --- a/compat-include/linux/net.h +++ b/compat-include/linux/net.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/netdev_features.h b/compat-include/linux/netdev_features.h index 5d82d4a..129b28e 100644 --- a/compat-include/linux/netdev_features.h +++ b/compat-include/linux/netdev_features.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 9ff91b5..2de73b8 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/percpu.h b/compat-include/linux/percpu.h index c37b423..04d87d8 100644 --- a/compat-include/linux/percpu.h +++ b/compat-include/linux/percpu.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/printk.h b/compat-include/linux/printk.h index ecf4289..bf66859 100644 --- a/compat-include/linux/printk.h +++ b/compat-include/linux/printk.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/random.h b/compat-include/linux/random.h index 7e2eaef..098efc5 100644 --- a/compat-include/linux/random.h +++ b/compat-include/linux/random.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h index ca17506..9819876 100644 --- a/compat-include/linux/rculist.h +++ b/compat-include/linux/rculist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h index cddf775..d02df96 100644 --- a/compat-include/linux/rcupdate.h +++ b/compat-include/linux/rcupdate.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h index 18c0432..7d43d02 100644 --- a/compat-include/linux/seq_file.h +++ b/compat-include/linux/seq_file.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index 96b018c..7b5b857 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/slab.h b/compat-include/linux/slab.h index d6a341d..bc046dd 100644 --- a/compat-include/linux/slab.h +++ b/compat-include/linux/slab.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat.h b/compat.h index 7152237..ab6de5a 100644 --- a/compat.h +++ b/compat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 207e2af..b1f803b 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index a7485d6..ac1b24e 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 23ce90e..636f3d6 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index b56bb00..51f6486 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 3e41bb8..30d767b 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 034db05..d56f6d7 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 579f0fa..01ce240 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 48253cf..6f765ac 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 1ab4e2e..a4decb7 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 017fffe..6db23f0 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 813ecea..8c25808 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 55656e8..dc51d1b 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h index 9ff77c7..0e6a44a 100644 --- a/net/batman-adv/fragmentation.h +++ b/net/batman-adv/fragmentation.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 5950974..403e6a7 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index 582dd8c..3909476 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 5ee04f7..b047696 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index b583463..48df505 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index db90022..a0391e0 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 67f5329..fc38f13 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index a0a0fdb..7bd9936 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 9bb57b8..de804fa 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index a69da37..0fe013c 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 618d5de..34cdff1 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a9b4f75..b4105c0 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8c01f54..7cff69a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 155565e..75a2493 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 80bceec..300771d 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 9e5474d..067ba05 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index d6d7fb4..4990886 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index d577760..ae0489f 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index af8bea1..303dbfc 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index e7f9151..58dd78a 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 1c8b35d..f24d576 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 02a5caa..f3d62e7 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index d8b03fd..132d965 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 7ff95ca..70c2325 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 4bf35b8..a83e210 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d17cfba..bda4efe 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 964fc59..6bedbdc 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index c76021b..6c4fa8f 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 012545b..a603ca5 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 7c7e2c0..5ceaa7a 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 8974bc0..0dd762c 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * -- 2.7.0

2 2

[B.A.T.M.A.N.] alfred dies without any log/dmesg entry
by 3zl Trizonelabs 11 Jan '16

11 Jan '16

ref: alfred ver 2015.1 / .2 @openwrt CC afred.facters disabled alfred process dies (not listed in ps ) without leaving any log entry does anybody have any hint or idea ? cheers

2 1

[B.A.T.M.A.N.] pull request: batman-adv 20160109
by Antonio Quartulli 10 Jan '16

10 Jan '16

Hello David, here you have a late batch of patches intended for net-next. Most of the changes are about kerneldoc and other minor cleanups introduced by Sven Eckelmann and Marek Lindner. Other than those you have the number of BLA wait periods increased to 6 to reduce the probability of temporary LAN loops by Simon Wunderlich. Several useless NULL checks have been removed by Markus Elfring in order to make the code simpler and slimmer. Another change by Simon Wunderlich makes sure that the function consuming the value written in a sysfs file is executed only when such value was really changed to a new value. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit d86cdfcd5d7e1179e695977b7088882822f365c4: Merge branch 'r8152-adjustments' (2016-01-08 21:57:26 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to ed21d170e878b6b067a3216040b7b935c8007196: batman-adv: Add kerneldoc for batadv_neigh_node::refcount (2016-01-09 20:56:00 +0800) ---------------------------------------------------------------- Included changes: - increase internal module version - increase BLA wait periods to 6 - purge BLA backbone table when it is disabled - make sure post function is invoked only if sysfs value is changed - simplify code by removing useless NULL checks - various corrections to existing kerneldoc - minor cleanups ---------------------------------------------------------------- Marek Lindner (1): batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag Markus Elfring (4): batman-adv: Delete unnecessary checks before the function call "kfree_skb" batman-adv: Less checks in batadv_tvlv_unicast_send() batman-adv: Delete an unnecessary check before the function call "batadv_softif_vlan_free_ref" batman-adv: Split a condition check Simon Wunderlich (4): batman-adv: Start new development cycle batman-adv: purge bridge loop avoidance when its disabled batman-adv: increase BLA wait periods to 6 batman-adv: only call post function if something changed Sven Eckelmann (7): batman-adv: Fix lockdep annotation of batadv_tlv_container_remove batman-adv: Add function to convert string to batadv throughput batman-adv: Change ifconfig examples to iproute2 batman-adv: Fix kernel-doc parsing of main structs batman-adv: Fix kerneldoc member names in for main structs batman-adv: Remove kerneldoc for missing struct members batman-adv: Add kerneldoc for batadv_neigh_node::refcount Documentation/networking/batman-adv.txt | 9 ++- net/batman-adv/bat_iv_ogm.c | 3 - net/batman-adv/bridge_loop_avoidance.c | 20 ++++++ net/batman-adv/bridge_loop_avoidance.h | 2 + net/batman-adv/gateway_common.c | 117 +++++++++++++------------------- net/batman-adv/main.c | 17 ++--- net/batman-adv/main.h | 4 +- net/batman-adv/network-coding.c | 4 +- net/batman-adv/packet.h | 3 +- net/batman-adv/send.c | 3 +- net/batman-adv/sysfs.c | 16 +++-- net/batman-adv/translation-table.c | 8 ++- net/batman-adv/types.h | 32 +++++---- 13 files changed, 122 insertions(+), 116 deletions(-)

2 17

[B.A.T.M.A.N.] pull request [net]: 20160107
by Antonio Quartulli 09 Jan '16

09 Jan '16

Hello David, I know it is extremely late in the release cycle, but please accept this single (and small) change intended for net. This bug-fix provided by Sven Eckelmann prevents a wrong memory access in setups with multiple interfaces enslaved in batman-adv (very common nowadays). When such bad access is performed the code ends up filling with random data an internal data structure used to compute the links metric, thus leading to undefined behaviours. This bug is there since ever, therefore it would be really nice if could get it queued for inclusion in stable. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 51cb67c0b0fcb91581b15bd2e85f29af4d4b2df6: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-01-06 16:15:03 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 13bbdd370f67aef3351ad7bbc2fb624e3c23f905: batman-adv: Fix invalid read while copying bat_iv.bcast_own (2016-01-07 14:24:05 +0800) ---------------------------------------------------------------- Included change: - Fix invalid read while copying bat_iv.bcast_own by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (1): batman-adv: Fix invalid read while copying bat_iv.bcast_own net/batman-adv/bat_iv_ogm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

2 3

Re: [B.A.T.M.A.N.] Compiling Batman-adv on Kernel 4.4+
by Sven Eckelmann 06 Jan '16

06 Jan '16

On Wednesday 06 January 2016 12:19:04 fred veldini wrote: > I sent an email to the list a while ago, not sure if anyone received the > message. Usually I ignore mails which are send to me directly about batman-adv without Cc'ing the mailing list. But I trust that you (at least) tried to send a mail. But I never saw your mail in the queue of pending mails (maybe Marek did). Please send your mails next time as plain text and not with html content. At least I could find that your mail bounced on Jan 4 17:17:17. So you should have been informed that it was rejected (for whatever reason). > I'm running into an issue compiling the latest batman-adv code on the > latest kernel, [...] > /mnt/builds/batman-Jan-5-2016/batman-adv-6219a1b/net/batman-adv/hard-interfa > ce.c:469:2: error: too few arguments to function > 'netdev_master_upper_dev_link' In file included from > /mnt/builds/batman-Jan-5-2016/batman-adv-6219a1b/compat-include/linux/netdev > ice.h:25:0, from include/linux/etherdevice.h:26, > from You don't use an official kernel and the compat layer of batman-adv can only support major releases or Linus' development tree. But you can try to change the netdev_master_upper_dev_link compat layer under compat- include/linux/netdevice.h. Try replacing all "KERNEL_VERSION(4, 5, 0)" with "KERNEL_VERSION(4, 4, 0)" or whatever the LINUX_VERSION_CODE of your development kernel is. I guess this is causing the problem because you use changes which are for Linux 4.5 but your kernel still uses the LINUX_VERSION_CODE for Linux 4.4 Kind regards, Sven

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: update copyright years for 2016
by Sven Eckelmann 06 Jan '16

06 Jan '16

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- compat-include/linux/atomic.h | 2 +- compat-include/linux/bug.h | 2 +- compat-include/linux/compiler.h | 2 +- compat-include/linux/etherdevice.h | 2 +- compat-include/linux/export.h | 2 +- compat-include/linux/if_ether.h | 2 +- compat-include/linux/if_vlan.h | 2 +- compat-include/linux/kconfig.h | 2 +- compat-include/linux/kernel.h | 2 +- compat-include/linux/list.h | 2 +- compat-include/linux/lockdep.h | 2 +- compat-include/linux/moduleparam.h | 2 +- compat-include/linux/net.h | 2 +- compat-include/linux/netdev_features.h | 2 +- compat-include/linux/netdevice.h | 2 +- compat-include/linux/percpu.h | 2 +- compat-include/linux/printk.h | 2 +- compat-include/linux/random.h | 2 +- compat-include/linux/rculist.h | 2 +- compat-include/linux/rcupdate.h | 2 +- compat-include/linux/seq_file.h | 2 +- compat-include/linux/skbuff.h | 2 +- compat-include/linux/slab.h | 2 +- compat.h | 2 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/multicast.h | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/network-coding.h | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index ee3be1d..e31c04b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# 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 # diff --git a/compat-include/linux/atomic.h b/compat-include/linux/atomic.h index 025c8b1..5f254fe 100644 --- a/compat-include/linux/atomic.h +++ b/compat-include/linux/atomic.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 * diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h index 9b7b571..a8b9508 100644 --- a/compat-include/linux/bug.h +++ b/compat-include/linux/bug.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 * diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index 29a02ae..8d47375 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.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 * diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h index aada96d..d69caf2 100644 --- a/compat-include/linux/etherdevice.h +++ b/compat-include/linux/etherdevice.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 * diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h index 3901b29..b69509d 100644 --- a/compat-include/linux/export.h +++ b/compat-include/linux/export.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 * diff --git a/compat-include/linux/if_ether.h b/compat-include/linux/if_ether.h index edfc7e8..fcf7f55 100644 --- a/compat-include/linux/if_ether.h +++ b/compat-include/linux/if_ether.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 * diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h index 0cbd5c4..28233a9 100644 --- a/compat-include/linux/if_vlan.h +++ b/compat-include/linux/if_vlan.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 * diff --git a/compat-include/linux/kconfig.h b/compat-include/linux/kconfig.h index a8d0766..bf5d8bf 100644 --- a/compat-include/linux/kconfig.h +++ b/compat-include/linux/kconfig.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 * diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h index c39cbe8..5ffec9a 100644 --- a/compat-include/linux/kernel.h +++ b/compat-include/linux/kernel.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 * diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h index 75bcc1c..014242a 100644 --- a/compat-include/linux/list.h +++ b/compat-include/linux/list.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 * diff --git a/compat-include/linux/lockdep.h b/compat-include/linux/lockdep.h index e646114..98bd41c 100644 --- a/compat-include/linux/lockdep.h +++ b/compat-include/linux/lockdep.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 * diff --git a/compat-include/linux/moduleparam.h b/compat-include/linux/moduleparam.h index c266b9c..c61098b 100644 --- a/compat-include/linux/moduleparam.h +++ b/compat-include/linux/moduleparam.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 * diff --git a/compat-include/linux/net.h b/compat-include/linux/net.h index c60acf7..65d9c7d 100644 --- a/compat-include/linux/net.h +++ b/compat-include/linux/net.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 * diff --git a/compat-include/linux/netdev_features.h b/compat-include/linux/netdev_features.h index f381142..129b28e 100644 --- a/compat-include/linux/netdev_features.h +++ b/compat-include/linux/netdev_features.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 * diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index eca7668..2de73b8 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.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 * diff --git a/compat-include/linux/percpu.h b/compat-include/linux/percpu.h index 0fbcaae..04d87d8 100644 --- a/compat-include/linux/percpu.h +++ b/compat-include/linux/percpu.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 * diff --git a/compat-include/linux/printk.h b/compat-include/linux/printk.h index 2b31ed1..bf66859 100644 --- a/compat-include/linux/printk.h +++ b/compat-include/linux/printk.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 * diff --git a/compat-include/linux/random.h b/compat-include/linux/random.h index 55b0384..098efc5 100644 --- a/compat-include/linux/random.h +++ b/compat-include/linux/random.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 * diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h index 0b8d7c6..9819876 100644 --- a/compat-include/linux/rculist.h +++ b/compat-include/linux/rculist.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 * diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h index f0d0413..d02df96 100644 --- a/compat-include/linux/rcupdate.h +++ b/compat-include/linux/rcupdate.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 * diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h index 3c0c618..7d43d02 100644 --- a/compat-include/linux/seq_file.h +++ b/compat-include/linux/seq_file.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 * diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index d363cc0..7b5b857 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.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 * diff --git a/compat-include/linux/slab.h b/compat-include/linux/slab.h index 276d678..bc046dd 100644 --- a/compat-include/linux/slab.h +++ b/compat-include/linux/slab.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 * diff --git a/compat.h b/compat.h index f6f8c44..ab6de5a 100644 --- a/compat.h +++ b/compat.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 * diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 21434ab..b1f803b 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -1,5 +1,5 @@ # -# 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 # diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index 4e59cf3..ac1b24e 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 12bdffa..b92e03d 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -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 * diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 3404195..51f6486 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 2b64d7a..30d767b 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index d9b034a..54aaa92 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 7ea199b..01ce240 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 0fc9df5..6f765ac 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 80ab8d6..a4decb7 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 60df823..6db23f0 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 26d4a52..8c25808 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 80eddf4..dc51d1b 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h index c5476fe..0e6a44a 100644 --- a/net/batman-adv/fragmentation.h +++ b/net/batman-adv/fragmentation.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 8350775..403e6a7 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index fa95277..3909476 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index b287448..b047696 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index ab893e3..48df505 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 49e05d2..a0391e0 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -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 * diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 5a31420..fc38f13 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.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 * diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index 2ea6a18..7bd9936 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 071a87e..de804fa 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index bcabb5e..0fe013c 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -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 * diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index e937143..34cdff1 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.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 * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 9d34be6..1905ef3 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -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 * diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index a58dc2f..be27f2f 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.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 * diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8abf488..5ef66b8 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 685219f..300771d 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2016 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 56100c5..067ba05 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index 8f6d4ad..4990886 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 00b0437..ae0489f 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 2955775..303dbfc 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.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 * diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index fdb0163..58dd78a 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.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 * diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 0ba5993..f24d576 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -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 * diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 5315fb3..f3d62e7 100644 --- 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 * diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index c188f46..132d965 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -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 * diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 3adc11f..70c2325 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.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 * diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 6c65de9..a83e210 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -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 * diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 8e82176..bda4efe 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.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 * diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index f38d7b7..6bedbdc 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index 6197442..6c4fa8f 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 1ca8831..a603ca5 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -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, Antonio Quartulli * diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index abd8e11..5ceaa7a 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.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, Antonio Quartulli * diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 5e8c8df..0dd762c 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.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 * -- 2.6.4

2 1

[B.A.T.M.A.N.] [PATCH] batctl: update copyright years for 2016
by Sven Eckelmann 06 Jan '16

06 Jan '16

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- allocate.h | 2 +- bat-hosts.c | 2 +- bat-hosts.h | 2 +- bisect_iv.c | 2 +- bisect_iv.h | 2 +- debug.c | 2 +- debug.h | 2 +- functions.c | 2 +- functions.h | 2 +- hash.c | 2 +- hash.h | 2 +- ioctl.c | 2 +- ioctl.h | 2 +- list-batman.c | 2 +- list-batman.h | 2 +- main.c | 2 +- main.h | 2 +- packet.h | 2 +- ping.c | 2 +- ping.h | 2 +- sys.c | 2 +- sys.h | 2 +- tcpdump.c | 2 +- tcpdump.h | 2 +- traceroute.c | 2 +- traceroute.h | 2 +- translate.c | 2 +- translate.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index d83d2e8..b82c0c6 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2006-2015 B.A.T.M.A.N. contributors +# Copyright (C) 2006-2016 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/allocate.h b/allocate.h index 02edf5c..a20f891 100644 --- a/allocate.h +++ b/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bat-hosts.c b/bat-hosts.c index 72bec80..a4add34 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bat-hosts.h b/bat-hosts.h index f402455..78c7b2b 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bisect_iv.c b/bisect_iv.c index 5b9c041..0f2c0cb 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bisect_iv.h b/bisect_iv.h index ec575d2..ace76c7 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.c b/debug.c index bcdeef7..3db3ed9 100644 --- a/debug.c +++ b/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.h b/debug.h index 6cbfcd8..df65f50 100644 --- a/debug.h +++ b/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/functions.c b/functions.c index 3fcd2ad..be8f8b0 100644 --- a/functions.c +++ b/functions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/functions.h b/functions.h index 02ed5ea..d0b05b9 100644 --- a/functions.h +++ b/functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/hash.c b/hash.c index 069a424..08d47b5 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index aa27f25..b090888 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/ioctl.c b/ioctl.c index 068f894..ca02414 100644 --- a/ioctl.c +++ b/ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ioctl.h b/ioctl.h index 55c9aab..a6f8a08 100644 --- a/ioctl.h +++ b/ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/list-batman.c b/list-batman.c index 1beafaf..affedb6 100644 --- a/list-batman.c +++ b/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/list-batman.h b/list-batman.h index c7372c8..53b8413 100644 --- a/list-batman.h +++ b/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index 96aea4d..a2cda5b 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/main.h b/main.h index 437721d..58fe794 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/packet.h b/packet.h index fdb0163..e7f9151 100644 --- a/packet.h +++ b/packet.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 * diff --git a/ping.c b/ping.c index a38b31a..05d6e97 100644 --- a/ping.c +++ b/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ping.h b/ping.h index a6c1e36..58d6bf9 100644 --- a/ping.h +++ b/ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.c b/sys.c index 838fcd8..afa8533 100644 --- a/sys.c +++ b/sys.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.h b/sys.h index 13c164e..da2769d 100644 --- a/sys.h +++ b/sys.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/tcpdump.c b/tcpdump.c index 0bbfefc..db28414 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de> * diff --git a/tcpdump.h b/tcpdump.h index 37ab241..dc9e5a6 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/traceroute.c b/traceroute.c index 62cf000..2cd29d9 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/traceroute.h b/traceroute.h index 2f1512d..6dc5603 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/translate.c b/translate.c index cefa9da..62c696a 100644 --- a/translate.c +++ b/translate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/translate.h b/translate.h index e349a70..f652091 100644 --- a/translate.h +++ b/translate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * -- 2.6.4

2 1

[B.A.T.M.A.N.] [PATCH v2 01/30] batman-adv: Fix list removal of batadv_hardif_neigh_node
by Sven Eckelmann 05 Jan '16

05 Jan '16

The neigh_list with batadv_hardif_neigh_node objects is accessed with only rcu_read_lock in batadv_neigh_node_get and batadv_iv_neigh_print. Thus it is not allowed to kfree the object before the rcu grace period ends (which may still protects context accessing this object). Therefore the object has first to be removed from the neigh_list and then it has either wait with synchronize_rcu or call_rcu till the grace period ends before it can be freed. Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: - split patchset into fixes and kref migration to make it easier when the decision is made where each patch will be applied net/batman-adv/originator.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 00b0437..2681c7d 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -217,10 +217,6 @@ static void batadv_hardif_neigh_free_rcu(struct rcu_head *rcu) hardif_neigh = container_of(rcu, struct batadv_hardif_neigh_node, rcu); - spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock); - hlist_del_init_rcu(&hardif_neigh->list); - spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock); - batadv_hardif_free_ref_now(hardif_neigh->if_incoming); kfree(hardif_neigh); } @@ -233,8 +229,13 @@ static void batadv_hardif_neigh_free_rcu(struct rcu_head *rcu) static void batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh) { - if (atomic_dec_and_test(&hardif_neigh->refcount)) + if (atomic_dec_and_test(&hardif_neigh->refcount)) { + spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock); + hlist_del_init_rcu(&hardif_neigh->list); + spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock); + batadv_hardif_neigh_free_rcu(&hardif_neigh->rcu); + } } /** @@ -244,8 +245,13 @@ batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh) */ void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh) { - if (atomic_dec_and_test(&hardif_neigh->refcount)) + if (atomic_dec_and_test(&hardif_neigh->refcount)) { + spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock); + hlist_del_init_rcu(&hardif_neigh->list); + spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock); + call_rcu(&hardif_neigh->rcu, batadv_hardif_neigh_free_rcu); + } } /** -- 2.6.4

2 41

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2016