commits March 2019

commits@lists.open-mesh.org

1 participants
63 discussions

[batman-adv] master: batman-adv: Make sysfs support optional (c585c6ca)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c585c6ca3db0d82b53bc7e03dc68cdc68fa74cbf Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 18:02:57 2019 +0100 batman-adv: Make sysfs support optional The sysfs files will be marked as deprecated in the near future. They are already replaced by the batadv generic netlink family. Add an Kconfig option to disable the sysfs support for users who want to test their tools or want to safe some space. This setting should currently still be enabled by default to keep backward compatible with legacy tools. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- c585c6ca3db0d82b53bc7e03dc68cdc68fa74cbf Makefile | 3 ++ README.external.rst | 1 + gen-compat-autoconf.sh | 3 +- net/batman-adv/Kconfig | 12 ++++++ net/batman-adv/Makefile | 2 +- net/batman-adv/bridge_loop_avoidance.c | 1 - net/batman-adv/gateway_client.c | 1 - net/batman-adv/main.c | 73 ++++++++++++++++++++++++++++++++++ net/batman-adv/main.h | 2 + net/batman-adv/sysfs.c | 70 -------------------------------- net/batman-adv/sysfs.h | 38 +++++++++++++++++- 11 files changed, 130 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index 3dfe2946..109d88a0 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,8 @@ export CONFIG_BATMAN_ADV_DAT=y export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. multicast optimizations: export CONFIG_BATMAN_ADV_MCAST=y +# B.A.T.M.A.N. sysfs support: +export CONFIG_BATMAN_ADV_SYSFS=y # B.A.T.M.A.N. tracing support: export CONFIG_BATMAN_ADV_TRACING=n # B.A.T.M.A.N. V routing algorithm (experimental): @@ -65,6 +67,7 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_DAT=$(CONFIG_BATMAN_ADV_DAT) \ CONFIG_BATMAN_ADV_NC=$(CONFIG_BATMAN_ADV_NC) \ CONFIG_BATMAN_ADV_MCAST=$(CONFIG_BATMAN_ADV_MCAST) \ + CONFIG_BATMAN_ADV_SYSFS=$(CONFIG_BATMAN_ADV_SYSFS) \ CONFIG_BATMAN_ADV_TRACING=$(CONFIG_BATMAN_ADV_TRACING) \ CONFIG_BATMAN_ADV_BATMAN_V=$(CONFIG_BATMAN_ADV_BATMAN_V) \ INSTALL_MOD_DIR=updates/ diff --git a/README.external.rst b/README.external.rst index e43902b4..57210cdf 100644 --- a/README.external.rst +++ b/README.external.rst @@ -49,6 +49,7 @@ module). Available options and their possible values are * ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table) * ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations) * ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding) + * ``CONFIG_BATMAN_ADV_SYSFS=[y*|n]`` (B.A.T.M.A.N. sysfs support) * ``CONFIG_BATMAN_ADV_TRACING=[y|n*]`` (B.A.T.M.A.N. tracing support) * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 0acda0f2..f877c8fe 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -46,7 +46,8 @@ gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_NC' ${CONFIG_BATMAN_ADV_NC:="n"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_TRACING' ${CONFIG_BATMAN_ADV_TRACING:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_SYSFS' ${CONFIG_BATMAN_ADV_SYSFS:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_TRACING' ${CONFIG_BATMAN_ADV_TRACING:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}" # only regenerate compat-autoconf.h when config was changed diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 17595ec0..a3d188df 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -97,6 +97,18 @@ config BATMAN_ADV_DEBUG buffer. The output is controlled via the batadv netdev specific log_level setting. +config BATMAN_ADV_SYSFS + bool "batman-adv sysfs entries" + depends on BATMAN_ADV + default y + help + Say Y here if you want to enable batman-adv device configuration and + status interface through sysfs attributes. It is replaced by the + batadv generic netlink family but still used by various userspace + tools and scripts. + + If unsure, say Y. + config BATMAN_ADV_TRACING bool "B.A.T.M.A.N. tracing support" depends on BATMAN_ADV diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 1bf7acfe..fd63e116 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -28,7 +28,7 @@ batman-adv-y += originator.o batman-adv-y += routing.o batman-adv-y += send.o batman-adv-y += soft-interface.o -batman-adv-y += sysfs.o +batman-adv-$(CONFIG_BATMAN_ADV_SYSFS) += sysfs.o batman-adv-$(CONFIG_BATMAN_ADV_TRACING) += trace.o batman-adv-y += tp_meter.o batman-adv-y += translation-table.o diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 5ce8b719..663a53b6 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -47,7 +47,6 @@ #include "netlink.h" #include "originator.h" #include "soft-interface.h" -#include "sysfs.h" #include "translation-table.h" static const u8 batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05}; diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index be63d670..47df4c67 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -41,7 +41,6 @@ #include "originator.h" #include "routing.h" #include "soft-interface.h" -#include "sysfs.h" #include "translation-table.h" /* These are the offsets of the "hw type" and "hw address length" in the dhcp diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 33b9b38b..dabcaff8 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -10,6 +10,7 @@ #include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/crc32c.h> +#include <linux/device.h> #include <linux/errno.h> #include <linux/genetlink.h> #include <linux/gfp.h> @@ -19,6 +20,7 @@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/kernel.h> +#include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/module.h> @@ -28,6 +30,7 @@ #include <linux/rcupdate.h> #include <linux/seq_file.h> #include <linux/skbuff.h> +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/stddef.h> #include <linux/string.h> @@ -72,6 +75,22 @@ struct workqueue_struct *batadv_event_workqueue; static void batadv_recv_handler_init(void); +#define BATADV_UEV_TYPE_VAR "BATTYPE=" +#define BATADV_UEV_ACTION_VAR "BATACTION=" +#define BATADV_UEV_DATA_VAR "BATDATA=" + +static char *batadv_uev_action_str[] = { + "add", + "del", + "change", + "loopdetect", +}; + +static char *batadv_uev_type_str[] = { + "gw", + "bla", +}; + static int __init batadv_init(void) { int ret; @@ -666,6 +685,60 @@ bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid) return ap_isolation_enabled; } +/** + * batadv_throw_uevent() - Send an uevent with batman-adv specific env data + * @bat_priv: the bat priv with all the soft interface information + * @type: subsystem type of event. Stored in uevent's BATTYPE + * @action: action type of event. Stored in uevent's BATACTION + * @data: string with additional information to the event (ignored for + * BATADV_UEV_DEL). Stored in uevent's BATDATA + * + * Return: 0 on success or negative error number in case of failure + */ +int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, + enum batadv_uev_action action, const char *data) +{ + int ret = -ENOMEM; + struct kobject *bat_kobj; + char *uevent_env[4] = { NULL, NULL, NULL, NULL }; + + bat_kobj = &bat_priv->soft_iface->dev.kobj; + + uevent_env[0] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_TYPE_VAR, + batadv_uev_type_str[type]); + if (!uevent_env[0]) + goto out; + + uevent_env[1] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_ACTION_VAR, + batadv_uev_action_str[action]); + if (!uevent_env[1]) + goto out; + + /* If the event is DEL, ignore the data field */ + if (action != BATADV_UEV_DEL) { + uevent_env[2] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_DATA_VAR, data); + if (!uevent_env[2]) + goto out; + } + + ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); +out: + kfree(uevent_env[0]); + kfree(uevent_env[1]); + kfree(uevent_env[2]); + + if (ret) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", + batadv_uev_type_str[type], + batadv_uev_action_str[action], + (action == BATADV_UEV_DEL ? "NULL" : data), ret); + return ret; +} + module_init(batadv_init); module_exit(batadv_exit); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 7973993a..c59afcba 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -382,5 +382,7 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len); bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid); +int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, + enum batadv_uev_action action, const char *data); #endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 4a4c4aa3..a8abda02 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -102,22 +102,6 @@ batadv_kobj_to_vlan(struct batadv_priv *bat_priv, struct kobject *obj) return vlan; } -#define BATADV_UEV_TYPE_VAR "BATTYPE=" -#define BATADV_UEV_ACTION_VAR "BATACTION=" -#define BATADV_UEV_DATA_VAR "BATDATA=" - -static char *batadv_uev_action_str[] = { - "add", - "del", - "change", - "loopdetect", -}; - -static char *batadv_uev_type_str[] = { - "gw", - "bla", -}; - /* Use this, if you have customized show and store functions for vlan attrs */ #define BATADV_ATTR_VLAN(_name, _mode, _show, _store) \ struct batadv_attribute batadv_attr_vlan_##_name = { \ @@ -1238,57 +1222,3 @@ void batadv_sysfs_del_hardif(struct kobject **hardif_obj) kobject_put(*hardif_obj); *hardif_obj = NULL; } - -/** - * batadv_throw_uevent() - Send an uevent with batman-adv specific env data - * @bat_priv: the bat priv with all the soft interface information - * @type: subsystem type of event. Stored in uevent's BATTYPE - * @action: action type of event. Stored in uevent's BATACTION - * @data: string with additional information to the event (ignored for - * BATADV_UEV_DEL). Stored in uevent's BATDATA - * - * Return: 0 on success or negative error number in case of failure - */ -int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, - enum batadv_uev_action action, const char *data) -{ - int ret = -ENOMEM; - struct kobject *bat_kobj; - char *uevent_env[4] = { NULL, NULL, NULL, NULL }; - - bat_kobj = &bat_priv->soft_iface->dev.kobj; - - uevent_env[0] = kasprintf(GFP_ATOMIC, - "%s%s", BATADV_UEV_TYPE_VAR, - batadv_uev_type_str[type]); - if (!uevent_env[0]) - goto out; - - uevent_env[1] = kasprintf(GFP_ATOMIC, - "%s%s", BATADV_UEV_ACTION_VAR, - batadv_uev_action_str[action]); - if (!uevent_env[1]) - goto out; - - /* If the event is DEL, ignore the data field */ - if (action != BATADV_UEV_DEL) { - uevent_env[2] = kasprintf(GFP_ATOMIC, - "%s%s", BATADV_UEV_DATA_VAR, data); - if (!uevent_env[2]) - goto out; - } - - ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); -out: - kfree(uevent_env[0]); - kfree(uevent_env[1]); - kfree(uevent_env[2]); - - if (ret) - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", - batadv_uev_type_str[type], - batadv_uev_action_str[action], - (action == BATADV_UEV_DEL ? "NULL" : data), ret); - return ret; -} diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index 2d13f59e..83fa808b 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -45,6 +45,8 @@ struct batadv_attribute { char *buf, size_t count); }; +#ifdef CONFIG_BATMAN_ADV_SYSFS + int batadv_sysfs_add_meshif(struct net_device *dev); void batadv_sysfs_del_meshif(struct net_device *dev); int batadv_sysfs_add_hardif(struct kobject **hardif_obj, @@ -54,7 +56,39 @@ int batadv_sysfs_add_vlan(struct net_device *dev, struct batadv_softif_vlan *vlan); void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv, struct batadv_softif_vlan *vlan); -int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, - enum batadv_uev_action action, const char *data); + +#else + +static inline int batadv_sysfs_add_meshif(struct net_device *dev) +{ + return 0; +} + +static inline void batadv_sysfs_del_meshif(struct net_device *dev) +{ +} + +static inline int batadv_sysfs_add_hardif(struct kobject **hardif_obj, + struct net_device *dev) +{ + return 0; +} + +static inline void batadv_sysfs_del_hardif(struct kobject **hardif_obj) +{ +} + +static inline int batadv_sysfs_add_vlan(struct net_device *dev, + struct batadv_softif_vlan *vlan) +{ + return 0; +} + +static inline void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv, + struct batadv_softif_vlan *vlan) +{ +} + +#endif #endif /* _NET_BATMAN_ADV_SYSFS_H_ */

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20190328, created. batadv-next-for-davem-20190328
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

The annotated tag, batadv-next-for-davem-20190328 has been created at 1ca53392a2d480d2ee8bee09350558d3531ce7c1 (tag) tagging 32e727449c792b689c2a06a8b4cc9fef6270c5a7 (commit) replaces v5.0 tagged by Simon Wunderlich on Thu Mar 28 16:40:17 2019 +0100 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - Drop license boilerplate (obsoleted by SPDX license IDs), by Sven Eckelmann - Drop documentation for sysfs and debugfs Documentation, by Sven Eckelmann (2 patches) - Mark sysfs as optional and deprecated, by Sven Eckelmann (3 patches) - Update MAINTAINERS Tree, Chat and Bugtracker, by Sven Eckelmann (3 patches) - Rename batadv_dat_send_data, by Sven Eckelmann - update DAT entries with incoming ARP replies, by Linus Luessing - add multicast-to-unicast support for limited destinations, by Linus Luessing -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlyc6uEWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSA9D/sEpVY0qOITIwzbttcyeDU5PPSD OF4dVCf6Za6CqfnPRCdViKAGtC1FOz+X2BXtedrIxgsjSPFoRvRoi1XBdu4Bobv2 /4wx56rz3AeMoBZ1UyziUIS6Qam1x7vVYSRXk+QHqBYVc16YiIePpCqTuryrzuk4 4MMqXz+V0dqm7z7irRDe7W9/CdFRtZEDAS8o6cgw4IlL56Ul3Yz6xP6p3PRA+H6V OWtVwmwcbX2KzZnrWDgql5NBhJ1bOfn2oDp1Y4RpLRmBp0iwg1qZdNZK2+MD2TTw xxuz5lsZFhTBXNqGgeoGk87m2z0wNkvnj9UnkMPl3gb7j+FyyaAgvVY4M2s2qJv/ ++wKDPPun/aGDOuo/rJdBTdlnToH17KS3jsDwhj4TooroI8uCCLWZQaYWkgjcugD ZKsZlIqFrfH3rPAzOBwRZodoYkOPpz/+xHp3p/cg9ANifwqpxqq3PY35BoP4ZXRi xUy79QgNIFxYXwrrqTrt3UrY8AGo1/OOHmA6nFQGZT79S648ZoG5vPDKFKRzTmcj Mj2GXuBzMIkWayHgnH69Kv9vVZc7mZPi7lartsVq/aZtMCh3HbPNfKtNOYsu4QEq 6c2966jvFB+LdTibiJQWbe0s5Z96UaFQUxH5+gGdM5TS5TCIaG3udXoI1ou4YVJI q6eOdAgblbD7oaNY4w== =WB31 -----END PGP SIGNATURE----- David S. Miller (5): Merge branch '100GbE' of git://git.kernel.org/.../jkirsher/next-queue Merge tag 'batadv-next-for-davem-20190201' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Merge tag 'batadv-next-for-davem-20190213' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Linus Lüssing (4): batman-adv: Snoop DHCPACKs for DAT bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls batman-adv: allow updating DAT entry timeouts on incoming ARP Replies batman-adv: Add multicast-to-unicast support for multiple targets Martin Weinelt (1): batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (24): batman-adv: Update copyright years for 2019 batman-adv: Move common genl doit code pre/post hooks batman-adv: Prepare framework for mesh genl config batman-adv: Prepare framework for hardif genl config batman-adv: Prepare framework for vlan genl config batman-adv: Add aggregated_ogms mesh genl configuration batman-adv: Add ap_isolation mesh/vlan genl configuration batman-adv: Add bonding mesh genl configuration batman-adv: Add bridge_loop_avoidance mesh genl configuration batman-adv: Add distributed_arp_table mesh genl configuration batman-adv: Add fragmentation mesh genl configuration batman-adv: Add gateway mesh genl configuration batman-adv: Add hop_penalty mesh genl configuration batman-adv: Add log_level mesh genl configuration batman-adv: Add multicast forceflood mesh genl configuration batman-adv: Add network_coding mesh genl configuration batman-adv: Add orig_interval mesh genl configuration batman-adv: Add elp_interval hardif genl configuration batman-adv: Add throughput_override hardif genl configuration batman-adv: Trigger genl notification on sysfs config change batman-adv: Drop license boilerplate batman-adv: Make sysfs support optional batman-adv: Warn about sysfs file access batman-adv: Adjust name for batadv_dat_send_data ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20190328, updated. batadv-net-for-davem-20190328
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

The annotated tag, batadv-net-for-davem-20190328 has been updated to e5d61e9695ee7facfa5b61b9cb415bc12e244e44 (tag) from dc313ffae6ce49136ed33eb068b4415a28a1af5c (which is now obsolete) tagging 438b3d3fae4346a49fe12fa7cc1dc9327f006a91 (commit) replaces v5.0 tagged by Simon Wunderlich on Thu Mar 28 16:30:05 2019 +0100 - Shortlog ------------------------------------------------------------ Here are some batman-adv bugfixes: - Fix refcount underflows in bridge loop avoidance code, by Sven Eckelmann (3 patches) - Fix warning when CFG80211 isn't enabled, by Anders Roxell - Fix genl notification for throughput override, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlyc6H0WHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoQh1D/sHYiFZsMDvwZ6s1ryUSwfj5ThX 3hgYsWzjN6MW2WMFpM/nQ448bLqvXveYOA0R+IpVWB5LOOmRFs7lgjx6J+Vq8SQk dGx+dBrywqTLRzf5al5RPIW2sO4Z6JLXyGU0KioywSd61qj7ii8sRf0fK0tDy/Mr EVvTsjs2nywj43b4dy5szJ1hELW5CEUAtNzGDZA0DogH9clhsTi1yG07eC8UrGpj n0YrbB7SZFFQkNCpbN0DR7qeKwDEPedRQTlDxUtxXCE0acRyHai1qKFoMzEWMJZ0 tLqTMYNHRxCYTv3D8qLQVmq2cO6rCUodfjrMKdyiZs6pM5QR39sBhWfzH1WObo90 gMXM6hAkRGnLgUSh0Wbz1TkRMio8NgPNr9hAdUsuF5yYSni0RxZtGfCeUiby8Znk IGLNHdmITgfFcxHuVtFpBspl3Bdsbnk0+PR4RMkiMtoPhz8RG2oltGpvZ9sG8hJ3 W8ZSI0f2LWueygwKEaiC4Kb7Kz1pgKiB5xPWdBK6+WfujRV+zK3+n+JSygLuJhlf tYpRZk0A2JBHPzDC3B865FFo9089SBBN/WekohsVibnWN7MQnolnGhlFyekjic04 aPMvn+OX7vS9lnSSkBcsen0GFtqZFd7pzt9hWQkyHuJZ8b48KebjuL3Z4w0Uaz6c WqUXAKKs2KPFIKEgFg== =+6Ww -----END PGP SIGNATURE----- Anders Roxell (1): batman-adv: fix warning in function batadv_v_elp_get_throughput David S. Miller (5): Merge branch '100GbE' of git://git.kernel.org/.../jkirsher/next-queue Merge tag 'batadv-next-for-davem-20190201' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Merge tag 'batadv-next-for-davem-20190213' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Linus Lüssing (2): batman-adv: Snoop DHCPACKs for DAT bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls Martin Weinelt (1): batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (24): batman-adv: Update copyright years for 2019 batman-adv: Move common genl doit code pre/post hooks batman-adv: Prepare framework for mesh genl config batman-adv: Prepare framework for hardif genl config batman-adv: Prepare framework for vlan genl config batman-adv: Add aggregated_ogms mesh genl configuration batman-adv: Add ap_isolation mesh/vlan genl configuration batman-adv: Add bonding mesh genl configuration batman-adv: Add bridge_loop_avoidance mesh genl configuration batman-adv: Add distributed_arp_table mesh genl configuration batman-adv: Add fragmentation mesh genl configuration batman-adv: Add gateway mesh genl configuration batman-adv: Add hop_penalty mesh genl configuration batman-adv: Add log_level mesh genl configuration batman-adv: Add multicast forceflood mesh genl configuration batman-adv: Add network_coding mesh genl configuration batman-adv: Add orig_interval mesh genl configuration batman-adv: Add elp_interval hardif genl configuration batman-adv: Add throughput_override hardif genl configuration batman-adv: Trigger genl notification on sysfs config change batman-adv: Reduce claim hash refcnt only for removed entry batman-adv: Reduce tt_local hash refcnt only for removed entry batman-adv: Reduce tt_global hash refcnt only for removed entry batman-adv: Fix genl notification for throughput_override ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20190328, created. batadv-net-for-davem-20190328
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

The annotated tag, batadv-net-for-davem-20190328 has been created at dc313ffae6ce49136ed33eb068b4415a28a1af5c (tag) tagging 438b3d3fae4346a49fe12fa7cc1dc9327f006a91 (commit) replaces v5.0 tagged by Simon Wunderlich on Thu Mar 28 16:27:16 2019 +0100 - Shortlog ------------------------------------------------------------ Hare are some batman-adv bugfixes: - Fix refcount underflow in bridge loop avoidance Code, by Sven Eckelmann (3 patches) - Fix warning when CFG80211 isn't enabled, by Anders Roxell - Fix genl notification for throughput override, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlyc59QWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoU3xEAC7sKFumKny/FbUK2WeAZSI3VRK l4hmDbNed5LFw4su6tD5GZqrWj2OgulS3u2jm8O8FY3fGbtmv/2bz0vIQtGYUF/3 mpwV6D4oR6u9u01MwnfUI4pcyKrh1KyPPt9l3dVrSYuuwJoylqxagiXpfBwcAbmW 0JzsFHRF2HSAPCwNAwlqSjGNiXvGy0A/vlIewzakgL/unGZhmhTIoz8S56A0x4Pl 4s6PU02Wir47HuCm6PSHcfLOapuUQKcffc1nLilZ+Oryc/jf5gfOey7XcnxKxm4A bu50PESgu+co1JJvLY8ZJ14Mg4PhUVaOqyDYK+tmaw4J2mr35Ox4lciPFXDHkSSj Xe/iHPiTG/H8uwPJ5OlVW6cIBp90se2kSvFvfxZw03XgErVaRAfyH59Z/PB6burL nq5Ae6xdCj/DH0VMQ74Qds3j/7wmyWiRLkqoaWZZ/0RxP2G9iaxeNBo/AKOoGDlS gH8lf8keSafd9Q76s421aDmiHm8fVh1Z6YdZZN+2kN70ud2iAmDSfh6Tny79SIJh 76cv5Kka7xy+zeJp3H8ggqgMTzzT9S6AEhxs6c+VMO3F+k2J3mPSs5rBaoV5hXYi fAwuyWdA5iQu1tZKxxDf4RgeHBl6CHeABTAXRXR7MRgjIbRMX8CuEOnFCd1Ivfjl zYfmIrayhN0onLm+Uw== =5YpX -----END PGP SIGNATURE----- Anders Roxell (1): batman-adv: fix warning in function batadv_v_elp_get_throughput David S. Miller (5): Merge branch '100GbE' of git://git.kernel.org/.../jkirsher/next-queue Merge tag 'batadv-next-for-davem-20190201' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Merge tag 'batadv-next-for-davem-20190213' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Linus Lüssing (2): batman-adv: Snoop DHCPACKs for DAT bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls Martin Weinelt (1): batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (24): batman-adv: Update copyright years for 2019 batman-adv: Move common genl doit code pre/post hooks batman-adv: Prepare framework for mesh genl config batman-adv: Prepare framework for hardif genl config batman-adv: Prepare framework for vlan genl config batman-adv: Add aggregated_ogms mesh genl configuration batman-adv: Add ap_isolation mesh/vlan genl configuration batman-adv: Add bonding mesh genl configuration batman-adv: Add bridge_loop_avoidance mesh genl configuration batman-adv: Add distributed_arp_table mesh genl configuration batman-adv: Add fragmentation mesh genl configuration batman-adv: Add gateway mesh genl configuration batman-adv: Add hop_penalty mesh genl configuration batman-adv: Add log_level mesh genl configuration batman-adv: Add multicast forceflood mesh genl configuration batman-adv: Add network_coding mesh genl configuration batman-adv: Add orig_interval mesh genl configuration batman-adv: Add elp_interval hardif genl configuration batman-adv: Add throughput_override hardif genl configuration batman-adv: Trigger genl notification on sysfs config change batman-adv: Reduce claim hash refcnt only for removed entry batman-adv: Reduce tt_local hash refcnt only for removed entry batman-adv: Reduce tt_global hash refcnt only for removed entry batman-adv: Fix genl notification for throughput_override ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] tag 'v2019.1' created
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred New tag : v2019.1 Referencing: 99eb349f52cd1d9f4ece3763467ce83844e65225

1 0

[alfred] master: alfred: Start new development cycle (0065552)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 0065552d453264003bebd2fc8f239ed604d0f087 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Mar 28 16:16:02 2019 +0100 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0065552d453264003bebd2fc8f239ed604d0f087 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 47c6937..22d2897 100644 --- a/alfred.h +++ b/alfred.h @@ -21,7 +21,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2019.1" +#define SOURCE_VERSION "2019.2" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 83c16b0..70fd2c4 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -39,7 +39,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2019.1" +#define SOURCE_VERSION "2019.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index f0d568d..d899f4e 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -28,7 +28,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2019.1" +#define SOURCE_VERSION "2019.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (fbfd5c3)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit fbfd5c3c12aa4d0d536ff628909c9b93dba04681 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Mar 28 16:15:36 2019 +0100 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- fbfd5c3c12aa4d0d536ff628909c9b93dba04681 CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c19ea4f..e224ec5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0 +2019.1 (2019-03-28) +=================== + +* synchronization of batman-adv netlink header + 2019.0 (2019-02-01) ===================

1 0

[batctl] tag 'v2019.1' created
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batctl New tag : v2019.1 Referencing: ca518012c4518c22d233356f847469bfc4994629

1 0

[batctl] maint's head updated: batctl: Update CHANGELOG for upcoming release (03825ee)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batctl Branch 'maint' now includes: 2bb5f1d batctl: Start new development cycle bf7eb4d batctl: Add support for config mcast group in event monitor e381f98 batctl: Don't allocate new buffer for vlan parent device 3e4e03c batctl: Automatically translate vlan to mesh_iface 50e3ea7 batctl: Add settings_data hooks for netlink integration 74b6d3b batctl: Parse the arguments for gw_mode 29a6665 batctl: Add netlink simple query helper e7e71ce batctl: Support generic netlink for gw_mode command 9e34990 batctl: Support generic netlink for loglevel command a319ec4 batctl: Support generic netlink for isolation_mark command c498931 batctl: Support generic netlink for orig_interval command 3d1d036 batctl: Add helper to read/write boolean configuration values a67a55a batctl: Support generic netlink for aggregation command c56a63a batctl: Support generic netlink for ap_isolation command e40fbde batctl: Support generic netlink for bonding command 70e2dde batctl: Support generic netlink for bridge_loop_avoidance command a871d70 batctl: Support generic netlink for distributed_arp_table command a4f1eaf batctl: Support generic netlink for fragmentation command 0c9ee71 batctl: Support generic netlink for multicast_mode command 77c34f7 batctl: Support generic netlink for network_coding command e9aab6f batctl: Drop settings_data param lists c90d7c1 batctl: Fix kerneldoc of BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED 5f7a0b9 batctl: Fix typo "reseved" -> "reserved" cde0af8 batctl: Add hop_penalty setting command 3ab8f42 batctl: replace multicast_mode with multicast_forceflood command 03825ee batctl: Update CHANGELOG for upcoming release

1 0

[batctl] master: batctl: Start new development cycle (800c313)
by postmaster＠open-mesh.org 28 Mar '19

28 Mar '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 800c313c7e4bab2ac73200302e678f19870c1590 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Mar 28 16:12:36 2019 +0100 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 800c313c7e4bab2ac73200302e678f19870c1590 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 92d0e61..6ced576 100644 --- a/main.h +++ b/main.h @@ -31,7 +31,7 @@ #include <netlink/netlink.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2019.1" +#define SOURCE_VERSION "2019.2" #endif #define EXIT_NOSUCCESS 2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2019