commits December 2016

commits@lists.open-mesh.org

1 participants
29 discussions

[batman-adv] master: batman-adv: update copyright years for 2017 (2b3e82c)
by postmaster＠open-mesh.org 31 Dec '16

31 Dec '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2b3e82c207077762d501313051c5dc5da31e597a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:00:00 2017 +0100 batman-adv: update copyright years for 2017 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2b3e82c207077762d501313051c5dc5da31e597a Makefile | 2 +- compat-include/linux/average.h | 2 +- compat-include/linux/cache.h | 2 +- compat-include/linux/etherdevice.h | 2 +- compat-include/linux/ethtool.h | 2 +- compat-include/linux/export.h | 2 +- compat-include/linux/genetlink.h | 2 +- compat-include/linux/if_ether.h | 2 +- compat-include/linux/if_vlan.h | 2 +- compat-include/linux/kernel.h | 2 +- compat-include/linux/kref.h | 2 +- compat-include/linux/list.h | 2 +- compat-include/linux/net.h | 2 +- compat-include/linux/netdev_features.h | 2 +- compat-include/linux/netdevice.h | 2 +- compat-include/linux/netlink.h | 2 +- compat-include/linux/random.h | 2 +- compat-include/linux/rculist.h | 2 +- compat-include/linux/seq_file.h | 2 +- compat-include/linux/skbuff.h | 2 +- compat-include/linux/slab.h | 2 +- compat-include/net/genetlink.h | 2 +- compat.h | 2 +- include/uapi/linux/batman_adv.h | 2 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.c | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_iv_ogm.h | 2 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bat_v.h | 2 +- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_elp.h | 2 +- net/batman-adv/bat_v_ogm.c | 2 +- net/batman-adv/bat_v_ogm.h | 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/log.c | 2 +- net/batman-adv/log.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/netlink.c | 2 +- net/batman-adv/netlink.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/tp_meter.c | 2 +- net/batman-adv/tp_meter.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/tvlv.c | 2 +- net/batman-adv/tvlv.h | 2 +- net/batman-adv/types.h | 2 +- 83 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index b852a17..1eb6821 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h index 3ce9bd7..ec022cb 100644 --- a/compat-include/linux/average.h +++ b/compat-include/linux/average.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h index 7b7069a..dc2d43c 100644 --- a/compat-include/linux/cache.h +++ b/compat-include/linux/cache.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 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 721945c..45a079b 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h index 87f7577..05aee4d 100644 --- a/compat-include/linux/ethtool.h +++ b/compat-include/linux/ethtool.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h index c43b35b..59fa08f 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/genetlink.h b/compat-include/linux/genetlink.h index 9c5983d..4d2eb8a 100644 --- a/compat-include/linux/genetlink.h +++ b/compat-include/linux/genetlink.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 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..a4064b6 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-2017 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 4988597..255886c 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-2017 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 763e383..4cbc51d 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/kref.h b/compat-include/linux/kref.h index bb3442c..a30657c 100644 --- a/compat-include/linux/kref.h +++ b/compat-include/linux/kref.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 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 30a14e0..1053a4d 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-2017 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..0747eda 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-2017 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..aafba75 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-2017 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 e71e614..1a37952 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h index 4f2185d..085078c 100644 --- a/compat-include/linux/netlink.h +++ b/compat-include/linux/netlink.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 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..c5eae96 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-2017 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 d432bc6..47ac3c6 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-2017 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..3e8dbb4 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-2017 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 9dd92a5..95f645a 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-2017 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..3dc1b91 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 2e8e17a..100fa87 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat.h b/compat.h index d987577..d61a30e 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 734fe83..a83ddb7 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index f724d3c..915987b 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-2017 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c index 623d043..44fd073 100644 --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 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 3b5b69c..29f6312 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Linus Lüssing * diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index f00f666..7c3d994 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h index b9f3550..ae2ab52 100644 --- a/net/batman-adv/bat_iv_ogm.h +++ b/net/batman-adv/bat_iv_ogm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 2ac612d..0acd081 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h index 83b7763..dd7c4b6 100644 --- a/net/batman-adv/bat_v.h +++ b/net/batman-adv/bat_v.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Linus Lüssing * diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index f2fb2f0..b90c990 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index be17c0b..376ead2 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 38b9aab..03a35c9 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h index 4c4d45c..2068770 100644 --- a/net/batman-adv/bat_v_ogm.h +++ b/net/batman-adv/bat_v_ogm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 0322714..2b070c7 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-2017 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 0e6e9d0..cc262c9 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-2017 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 e7f690b..2d22fd5 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-2017 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 2827cd3..e157986 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-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 7792550..5406148 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index e49121e..9c5d4a6 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-2017 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 3641765..942be77 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-2017 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..ec364a3 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-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 5239616..92e411d 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-2017 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 b95f619..1a2d6c3 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-2017 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 52b8bd6..de9955d 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-2017 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 859166d..3baa3d4 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-2017 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 2118481..5db2e43 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-2017 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 8a5e1dd..0a6a97d 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-2017 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 61a431a..e348f76 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-2017 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 d6309a4..9f9890f 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-2017 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..b5f7e13 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-2017 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 557a704..0c905e9 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-2017 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 b310f38..6308c9f 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-2017 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 e44a7da..f3fec40 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index c73c317..4ef4bde 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index 3284a7b..7a2b9f4 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d46415e..5000c54 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-2017 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 8683542..57a8103 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-2017 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 090a69f..952ba81 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-2017 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 2cddaf5..2a78cdd 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-2017 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 0627381..ab13b4d 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 52eb162..f1cd8c5 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index ab5a3bf..e1f6fc7 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-2017 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..c66efb8 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-2017 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 8f3b296..8e2a4b2 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-2017 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 ebc5618..d94220a 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-2017 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 7a36bcf..8e8a5db 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-2017 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 9d657cf..bf5a0b9 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-2017 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 05c3ff4..5ede16c 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-2017 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 49021b7..d730826 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-2017 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 a94e1e8..f21166d 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-2017 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 4e447bf..233a823 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-2017 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 ec303dd..639c3ab 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 17c8441..0ae8b30 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-2017 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..e487412 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index c367c83..392a60d 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Edo Monticelli, Antonio Quartulli * diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h index ba922c4..a8ada5c 100644 --- a/net/batman-adv/tp_meter.h +++ b/net/batman-adv/tp_meter.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Edo Monticelli, Antonio Quartulli * diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 30ecbfb..941afad 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-2017 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 783fdba..411d586 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index a783420..1d9e267 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h index e4369b5..4d01400 100644 --- a/net/batman-adv/tvlv.h +++ b/net/batman-adv/tvlv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index e913aee..8f64a5c 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-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

[batctl] master: batctl: update copyright years for 2017 (52e7715)
by postmaster＠open-mesh.org 31 Dec '16

31 Dec '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 52e7715a23c46ee29b14971626ae52f1e5955929 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:00:01 2017 +0100 batctl: update copyright years for 2017 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 52e7715a23c46ee29b14971626ae52f1e5955929 Makefile | 2 +- allocate.h | 2 +- bat-hosts.c | 2 +- bat-hosts.h | 2 +- batman_adv.h | 2 +- bisect_iv.c | 2 +- bisect_iv.h | 2 +- debug.c | 2 +- debug.h | 2 +- functions.c | 2 +- functions.h | 2 +- genl.h | 2 +- hash.c | 2 +- hash.h | 2 +- icmp_helper.c | 2 +- icmp_helper.h | 2 +- interface.c | 2 +- interface.h | 2 +- ioctl.c | 2 +- ioctl.h | 2 +- list.h | 2 +- main.c | 2 +- main.h | 2 +- netlink.c | 2 +- netlink.h | 2 +- packet.h | 2 +- ping.c | 2 +- ping.h | 2 +- sys.c | 2 +- sys.h | 2 +- tcpdump.c | 2 +- tcpdump.h | 2 +- tp_meter.c | 2 +- tp_meter.h | 2 +- traceroute.c | 2 +- traceroute.h | 2 +- translate.c | 2 +- translate.h | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index cfc9465..6bebb7d 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2006-2016 B.A.T.M.A.N. contributors +# Copyright (C) 2006-2017 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 a20f891..99db2c1 100644 --- a/allocate.h +++ b/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bat-hosts.c b/bat-hosts.c index a4add34..015fbcb 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 78c7b2b..8466554 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/batman_adv.h b/batman_adv.h index 734fe83..a83ddb7 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/bisect_iv.c b/bisect_iv.c index 1cb79eb..28c7b05 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bisect_iv.h b/bisect_iv.h index 43aa80b..f1fe4d8 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.c b/debug.c index ddabbfb..ee04928 100644 --- a/debug.c +++ b/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.h b/debug.h index 1c9374a..c23af52 100644 --- a/debug.h +++ b/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/functions.c b/functions.c index abd5882..f8bacda 100644 --- a/functions.c +++ b/functions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 95cd6cf..b085f9d 100644 --- a/functions.h +++ b/functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/genl.h b/genl.h index 0b622bb..606a933 100644 --- a/genl.h +++ b/genl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/hash.c b/hash.c index 08d47b5..f4a7af7 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index b090888..6b44eef 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/icmp_helper.c b/icmp_helper.c index bf48cea..fb461d5 100644 --- a/icmp_helper.c +++ b/icmp_helper.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Simon Wunderlich * diff --git a/icmp_helper.h b/icmp_helper.h index cdaf554..be4cb7d 100644 --- a/icmp_helper.h +++ b/icmp_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/interface.c b/interface.c index 7258475..8cc4f92 100644 --- a/interface.c +++ b/interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/interface.h b/interface.h index 0ea7bd5..9977515 100644 --- a/interface.h +++ b/interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ioctl.c b/ioctl.c index ca02414..b1db5e4 100644 --- a/ioctl.c +++ b/ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ioctl.h b/ioctl.h index a6f8a08..9a89afb 100644 --- a/ioctl.h +++ b/ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/list.h b/list.h index 41feaa0..23df29e 100644 --- a/list.h +++ b/list.h @@ -1,6 +1,6 @@ /* Minimal Linux-like double-linked list helper functions * - * Copyright (c) 2012-2016, Sven Eckelmann <sven(a)narfation.org> + * Copyright (c) 2012-2017, Sven Eckelmann <sven(a)narfation.org> * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/main.c b/main.c index e67fc40..3f0b008 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 3ca4837..44a6c8a 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/netlink.c b/netlink.c index 5f4325b..9580aa3 100644 --- a/netlink.c +++ b/netlink.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/netlink.h b/netlink.h index 3e7713d..8355201 100644 --- a/netlink.h +++ b/netlink.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/packet.h b/packet.h index 7a36bcf..8e8a5db 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/ping.c b/ping.c index 23af551..4fef663 100644 --- a/ping.c +++ b/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 58d6bf9..fbe5632 100644 --- a/ping.h +++ b/ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.c b/sys.c index b524340..7817234 100644 --- a/sys.c +++ b/sys.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.h b/sys.h index 1365e76..595f45d 100644 --- a/sys.h +++ b/sys.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/tcpdump.c b/tcpdump.c index 2125b66..c7e0cbc 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de> * diff --git a/tcpdump.h b/tcpdump.h index 38d07c5..15d35b4 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/tp_meter.c b/tp_meter.c index f95b839..4f4122c 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli <a(a)unstable.cc> * diff --git a/tp_meter.h b/tp_meter.h index aef4dbc..bf17ad1 100644 --- a/tp_meter.h +++ b/tp_meter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Antonio Quartulli <a(a)unstable.cc> * diff --git a/traceroute.c b/traceroute.c index 89e5ad9..e7c55ef 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 6dc5603..05e5d3f 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/translate.c b/translate.c index 62c696a..18bde4d 100644 --- a/translate.c +++ b/translate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2017 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 f652091..7ecb7b7 100644 --- a/translate.h +++ b/translate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> *

1 0

[linux-merge]linux integration; annotated tag, v4.10-rc1, created. v4.10-rc1
by postmaster＠open-mesh.org 26 Dec '16

26 Dec '16

The annotated tag, v4.10-rc1 has been created at 2b3b80e8b9daba3e8e12f23f1acde4bd0ec88427 (tag) tagging 7ce7d89f48834cefece7804d38fc5d85382edf77 (commit) replaces v4.9 tagged by Linus Torvalds on Sun Dec 25 16:13:20 2016 -0800 - Shortlog ------------------------------------------------------------ Linux 4.10-rc1 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYYGCgAAoJEHm+PkMAQRiGjVMH/R1WKLSCVyU2QboSTZVyBGqU 6E42pMalPNaY72uxf29ZmUzds1uV5KyFn7OntsyD4qc+sQb2wxG5PvMSYAsL7HKN lTFiW738zC9Hfx8MzC/fHLGm/7HTHpPFndZJkDOJjIPnS0MeTHAmOFM+RwCRq+px 5uvRHV4Z8yibHtijET6GqCywV0gw/uyXCi6xJfJNAspnj3hsm3ZXKJ0JPvP2ja+V yhdnWYHDEQwRs6FyNtIWnfjH92XilVn4KcOtwnb1pFahALiTmmVqJVMiGartagqJ fPRw98B3YHwmZpEc2SDbXaZi36WLu4hcWvvDa22SN/srXwYIzzblEwuNq1+fiBw= =X7z+ -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: remove unsed argument from batadv_dbg_arp() function David S. Miller (6): Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batadv-next-for-davem-20161108-v2' of git://git.open-mesh.org/linux-merge Merge tag 'batadv-next-for-davem-20161119' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Jarod Wilson (1): net: use core MTU range checking in misc drivers Johannes Berg (3): genetlink: no longer support using static family IDs genetlink: statically initialize families genetlink: mark families as __ro_after_init Linus Lüssing (8): batman-adv: fix batadv_forw_packet kerneldoc for list attribute batman-adv: Allow selecting BATMAN V if CFG80211 is not built batman-adv: Add wrapper for ARP reply creation batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free batman-adv: Remove unused skb_reset_mac_header() batman-adv: Use own timer for multicast TT and TVLV updates batman-adv: Simple (re)broadcast avoidance batman-adv: fix rare race conditions on interface removal Marek Lindner (3): batman-adv: refactor wifi interface detection batman-adv: additional checks for virtual interfaces on top of WiFi batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface Markus Elfring (1): batman-adv: Less function calls in batadv_is_ap_isolated() after error detection Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (25): batman-adv: Remove unused function batadv_hash_delete batman-adv: Move batadv_sum_counter to soft-interface.c batman-adv: Remove unused batadv_icmp_user_cmd_type batman-adv: Remove needless init of variables on stack batman-adv: Use proper name for fragments list head batman-adv: Use proper name for gateway list head batman-adv: Use octal permissions instead of macros batman-adv: Avoid precedence issues in macros batman-adv: Revert "use core MTU range checking in misc drivers" batman-adv: Introduce missing headers for genetlink restructure batman-adv: Mark batadv_netlink_ops as const batman-adv: Close two alignment holes in batadv_hard_iface batman-adv: use consume_skb for non-dropped packets batman-adv: Count all non-success TX packets as dropped batman-adv: Consume skb in batadv_frag_send_packet batman-adv: Consume skb in batadv_send_skb_to_orig batman-adv: Consume skb in receive handlers batman-adv: Remove dev_queue_xmit return code exception batman-adv: Disallow mcast src address for data frames batman-adv: Disallow zero and mcast src address for mgmt frames batman-adv: Return non-const ptr in batadv_getlink_net batman-adv: Reject unicast packet with zero/mcast dst address batman-adv: Cache the type of wifi device for each hardif batman-adv: Update wifi flags on upper link change batman-adv: Add module alias for batadv netlink family ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] maint's head updated: batctl: Update CHANGELOG for upcoming release (527daf0)
by postmaster＠open-mesh.org 16 Dec '16

16 Dec '16

Repository : ssh://git@open-mesh.org/batctl Branch 'maint' now includes: 231e4e6 batctl: Fix netlink header includes for musl 527daf0 batctl: Update CHANGELOG for upcoming release

1 0

[batman-adv] ecsv/pu, master: batman-adv: Remove one condition check in batadv_route_unicast_packet (eab7617)
by postmaster＠open-mesh.org 16 Dec '16

16 Dec '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit eab7617142d2ff1a8a29592e260b064d545ee896 Author: Gao Feng <gfree.wind(a)gmail.com> Date: Mon Nov 21 23:01:09 2016 +0800 batman-adv: Remove one condition check in batadv_route_unicast_packet It could decrease one condition check to collect some statements in the first condition block. Signed-off-by: Gao Feng <gfree.wind(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- eab7617142d2ff1a8a29592e260b064d545ee896 net/batman-adv/routing.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6b08b26..9d657cf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -719,20 +719,18 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len = skb->len; res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) - ret = NET_RX_SUCCESS; - - /* skb was consumed */ - skb = NULL; - /* translate transmit result into receive result */ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { + ret = NET_RX_SUCCESS; /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, len + ETH_HLEN); } + /* skb was consumed */ + skb = NULL; + put_orig_node: batadv_orig_node_put(orig_node); free_skb:

1 0

[batman-adv] ecsv/pu, master: batman-adv: Treat NET_XMIT_CN as transmit successfully (1120b81)
by postmaster＠open-mesh.org 16 Dec '16

16 Dec '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit 1120b81c74187f489c08fc9438305071def089cc Author: Gao Feng <gfree.wind(a)gmail.com> Date: Mon Nov 21 23:00:32 2016 +0800 batman-adv: Treat NET_XMIT_CN as transmit successfully The tc could return NET_XMIT_CN as one congestion notification, but it does not mean the packet is lost. Other modules like ipvlan, macvlan, and others treat NET_XMIT_CN as success too. So batman-adv should add the NET_XMIT_CN check. Signed-off-by: Gao Feng <gfree.wind(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1120b81c74187f489c08fc9438305071def089cc net/batman-adv/distributed-arp-table.c | 3 ++- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/routing.c | 10 +++++----- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/tp_meter.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 49576c5..3641765 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -659,7 +659,8 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, } send_status = batadv_send_unicast_skb(tmp_skb, neigh_node); - if (send_status == NET_XMIT_SUCCESS) { + if (send_status == NET_XMIT_SUCCESS || + send_status == NET_XMIT_CN) { /* count the sent packet */ switch (packet_subtype) { case BATADV_P_DAT_DHT_GET: diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 9c561e6..5239616 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -509,7 +509,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, skb_fragment->len + ETH_HLEN); ret = batadv_send_unicast_skb(skb_fragment, neigh_node); - if (ret != NET_XMIT_SUCCESS) { + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) { ret = NET_XMIT_DROP; goto free_skb; } diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6713bdf..6b08b26 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -262,7 +262,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmph->ttl = BATADV_TTL; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ @@ -330,7 +330,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet->ttl = BATADV_TTL; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res == NET_RX_SUCCESS) + if (res == NET_RX_SUCCESS || res == NET_XMIT_CN) ret = NET_XMIT_SUCCESS; /* skb was consumed */ @@ -424,7 +424,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, /* route it */ res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ @@ -719,14 +719,14 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len = skb->len; res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS) + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) ret = NET_RX_SUCCESS; /* skb was consumed */ skb = NULL; /* translate transmit result into receive result */ - if (res == NET_XMIT_SUCCESS) { + if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 7b3494a..60516bb 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -386,7 +386,7 @@ send: ret = batadv_send_skb_via_tt(bat_priv, skb, dst_hint, vid); } - if (ret != NET_XMIT_SUCCESS) + if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) goto dropped_freed; } diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 981e8c5..c367c83 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -615,7 +615,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, batadv_tp_fill_prerandom(tp_vars, data, data_len); r = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (r == NET_XMIT_SUCCESS) + if (r == NET_XMIT_SUCCESS || r == NET_XMIT_CN) return 0; return BATADV_TP_REASON_CANT_SEND;

1 0

[batman-adv] ecsv/pu, master: batman-adv: don't add loop detect macs to TT (447df98)
by postmaster＠open-mesh.org 16 Dec '16

16 Dec '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit 447df986b83630a92ca9d33903023b7e1b2917f3 Author: Simon Wunderlich <simon.wunderlich(a)open-mesh.com> Date: Thu Nov 24 16:11:01 2016 +0100 batman-adv: don't add loop detect macs to TT The bridge loop avoidance (BLA) feature of batman-adv sends packets to probe for Mesh/LAN packet loops. Those packets are not sent by real clients and should therefore not be added to the translation table (TT). Signed-off-by: Simon Wunderlich <simon.wunderlich(a)open-mesh.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 447df986b83630a92ca9d33903023b7e1b2917f3 net/batman-adv/bridge_loop_avoidance.h | 18 ++++++++++++++++++ net/batman-adv/soft-interface.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 1ae93e4..2827cd3 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -20,6 +20,8 @@ #include "main.h" +#include <linux/compiler.h> +#include <linux/stddef.h> #include <linux/types.h> struct net_device; @@ -27,6 +29,22 @@ struct netlink_callback; struct seq_file; struct sk_buff; +/** + * batadv_bla_is_loopdetect_mac - check if the mac address is from a loop detect + * frame sent by bridge loop avoidance + * @mac: mac address to check + * + * Return: true if the it looks like a loop detect frame + * (mac starts with BA:BE), false otherwise + */ +static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac) +{ + if (mac[0] == 0xba && mac[1] == 0xbe) + return true; + + return false; +} + #ifdef CONFIG_BATMAN_ADV_BLA bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid, bool is_bcast); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 60516bb..4e447bf 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -258,7 +258,8 @@ static int batadv_interface_tx(struct sk_buff *skb, ethhdr = eth_hdr(skb); /* Register the client MAC in the transtable */ - if (!is_multicast_ether_addr(ethhdr->h_source)) { + if (!is_multicast_ether_addr(ethhdr->h_source) && + !batadv_bla_is_loopdetect_mac(ethhdr->h_source)) { client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source, vid, skb->skb_iif, skb->mark);

1 0

[alfred] tag 'v2016.5' created
by postmaster＠open-mesh.org 15 Dec '16

15 Dec '16

Repository : ssh://git@open-mesh.org/alfred New tag : v2016.5 Referencing: e80a884e962279c96221d0a0e514b4cda112f792

1 0

[alfred] master: alfred: Start new development cycle (935077b)
by postmaster＠open-mesh.org 15 Dec '16

15 Dec '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 935077bf83b32b4b4a9664de7af2df7b7fd3401d Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Dec 15 18:18:40 2016 +0100 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 935077bf83b32b4b4a9664de7af2df7b7fd3401d alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index eb8200c..44c6f30 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.5" +#define SOURCE_VERSION "2017.0" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 6ea06e6..da7a074 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.5" +#define SOURCE_VERSION "2017.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 017eddd..5386eae 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.5" +#define SOURCE_VERSION "2017.0" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (9932139)
by postmaster＠open-mesh.org 15 Dec '16

15 Dec '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 99321393c1118a4fc61e34aa7ba82f940bac19c8 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Dec 15 18:24:56 2016 +0100 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 99321393c1118a4fc61e34aa7ba82f940bac19c8 CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index aa099d5..47d728f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +alfred 2016.5: + + * support interface validity checks on systems without debugfs + * remove debugfs check during batadv-vis startup + * allow out-of-order txend packets during transmissions + + -- Thu, 15 Dec 2016 18:11:55 +0100 + alfred 2016.4: * add expert option to specify sync interval

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2016