commits

commits@lists.open-mesh.org

1 participants
12401 discussions

[batman-adv] master: batman-adv: Migrate to linux/prandom.h (fe773e9e)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit fe773e9e389a763f38539de3d4782b628676ac99 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 17 15:47:25 2020 +0200 batman-adv: Migrate to linux/prandom.h The commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to prandom.h") introduced a new header for the pseudo random functions from (previously) linux/random.h. One future goal of the prandom.h change is to make code to switch just the new header file and to avoid the implicit include. This would allow the removal of the implicit include from random.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fe773e9e389a763f38539de3d4782b628676ac99 compat-include/linux/prandom.h | 24 ++++++++++++++++++++++++ net/batman-adv/bat_iv_ogm.c | 1 + net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/network-coding.c | 2 +- 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/prandom.h b/compat-include/linux/prandom.h new file mode 100644 index 00000000..2863a57d --- /dev/null +++ b/compat-include/linux/prandom.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ + +#include <linux/version.h> +#if LINUX_VERSION_IS_GEQ(5, 8, 1) || \ + (LINUX_VERSION_IS_GEQ(4, 14, 193) && LINUX_VERSION_IS_LESS(4, 15, 0)) || \ + (LINUX_VERSION_IS_GEQ(4, 19, 138) && LINUX_VERSION_IS_LESS(4, 20, 0)) || \ + (LINUX_VERSION_IS_GEQ(5, 4, 57) && LINUX_VERSION_IS_LESS(5, 5, 0)) || \ + (LINUX_VERSION_IS_GEQ(5, 7, 14) && LINUX_VERSION_IS_LESS(5, 8, 0)) +#include_next <linux/prandom.h> +#else +#include <linux/random.h> +#endif + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ */ diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a4faf5f9..206d0b42 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,6 +27,7 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> +#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index d35aca0e..79a7dfc3 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -20,6 +20,7 @@ #include <linux/kref.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 717fe657..8c1148fc 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -20,6 +20,7 @@ #include <linux/lockdep.h> #include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 64619b7a..61ddd6d7 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -26,8 +26,8 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/printk.h> -#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h>

1 0

[batman-adv] master: batman-adv: Drop unused function batadv_hardif_remove_interfaces() (6ebf0570)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 6ebf0570ae3bb27f21f69cdc7a09808eb1cff7fd Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 7 22:49:50 2020 +0200 batman-adv: Drop unused function batadv_hardif_remove_interfaces() The function batadv_hardif_remove_interfaces was meant to remove all interfaces which are currently in the list of known (compatible) hardifs during module unload. But the function unregister_netdevice_notifier is called in batadv_exit before batadv_hardif_remove_interfaces. This will trigger NETDEV_UNREGISTER events for all available interfaces and in this process remove all interfaces from batadv_hardif_list. And batadv_hardif_remove_interfaces only operated on this (empty) list. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6ebf0570ae3bb27f21f69cdc7a09808eb1cff7fd net/batman-adv/hard-interface.c | 17 ----------------- net/batman-adv/hard-interface.h | 1 - net/batman-adv/main.c | 1 - 3 files changed, 19 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index fa06b51c..f95be90a 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -976,23 +976,6 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) batadv_hardif_put(hard_iface); } -/** - * batadv_hardif_remove_interfaces() - Remove all hard interfaces - */ -void batadv_hardif_remove_interfaces(void) -{ - struct batadv_hard_iface *hard_iface, *hard_iface_tmp; - - rtnl_lock(); - list_for_each_entry_safe(hard_iface, hard_iface_tmp, - &batadv_hardif_list, list) { - list_del_rcu(&hard_iface->list); - batadv_hardif_generation++; - batadv_hardif_remove_interface(hard_iface); - } - rtnl_unlock(); -} - /** * batadv_hard_if_event_softif() - Handle events for soft interfaces * @event: NETDEV_* event to handle diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index bad2e501..b1855d9d 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -100,7 +100,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, struct net *net, const char *iface_name); void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, enum batadv_hard_if_cleanup autodel); -void batadv_hardif_remove_interfaces(void); int batadv_hardif_min_mtu(struct net_device *soft_iface); void batadv_update_min_mtu(struct net_device *soft_iface); void batadv_hardif_release(struct kref *ref); diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 519c08c2..70fee9b4 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -137,7 +137,6 @@ static void __exit batadv_exit(void) batadv_netlink_unregister(); rtnl_link_unregister(&batadv_link_ops); unregister_netdevice_notifier(&batadv_hard_if_notifier); - batadv_hardif_remove_interfaces(); flush_workqueue(batadv_event_workqueue); destroy_workqueue(batadv_event_workqueue);

1 0

[alfred] tag 'v2020.3' created
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/alfred New tag : v2020.3 Referencing: be4e58266cb0ab1c0ff3c8fa86ac7d3f84a34e03

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (5205b6b)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 5205b6bfe5354dde1e87a04ebee926e78710c2cb Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Aug 24 18:42:27 2020 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 5205b6bfe5354dde1e87a04ebee926e78710c2cb CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0f2b36d..532c0b2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0 +2020.3 (2020-08-24) +=================== + +* synchronization of batman-adv netlink header + 2020.2 (2020-07-06) ===================

1 0

[alfred] master: alfred: Start new development cycle (3425515)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 34255158640ebe846803ae92c218e522aa53dc1e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Aug 24 18:42:49 2020 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 34255158640ebe846803ae92c218e522aa53dc1e 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 38a5f81..e3470f3 100644 --- a/alfred.h +++ b/alfred.h @@ -7,7 +7,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2020.3" +#define SOURCE_VERSION "2020.4" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 61bfb9a..23d11cb 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -25,7 +25,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2020.3" +#define SOURCE_VERSION "2020.4" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 450ace5..256ad89 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -14,7 +14,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2020.3" +#define SOURCE_VERSION "2020.4" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[batctl] tag 'v2020.3' created
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batctl New tag : v2020.3 Referencing: ee7103bccad9370d36799e8627db951ede15d26d

1 0

[batctl] master: batctl: Start new development cycle (9cd28cb)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 9cd28cb3d29ae6dab4ac73b21a5b3fbf16341d6d Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Aug 24 18:41:21 2020 +0200 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 9cd28cb3d29ae6dab4ac73b21a5b3fbf16341d6d main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 15f87d3..08ce000 100644 --- a/main.h +++ b/main.h @@ -17,7 +17,7 @@ #include <netlink/netlink.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2020.3" +#define SOURCE_VERSION "2020.4" #endif #define EXIT_NOSUCCESS 2

1 0

[batctl] master: batctl: Update CHANGELOG for upcoming release (bafea60)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit bafea60614740fc7907296a5deed84c3eaa941a1 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Aug 24 18:41:04 2020 +0200 batctl: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- bafea60614740fc7907296a5deed84c3eaa941a1 CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index df398ba..eb371fb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0 +2020.3 (2020-08-24) +=================== + +* add per interface hop penalty command + 2020.2 (2020-07-06) ===================

1 0

[batctl] maint's head updated: batctl: Update CHANGELOG for upcoming release (bafea60)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batctl Branch 'maint' now includes: 9867dab batctl: Start new development cycle 7641a56 batctl: Add per interface hop penalty command 6dcc536 batctl: Sync batman-adv uapi headers bafea60 batctl: Update CHANGELOG for upcoming release

1 0

[batctl] ecsv/bla,master: batctl: Sync batman-adv uapi headers (6dcc536)
by postmaster＠open-mesh.org 24 Aug '20

24 Aug '20

Repository : ssh://git@diktynna/batctl On branches: ecsv/bla,master >--------------------------------------------------------------- commit 6dcc536cfe1396d1ef61fad1e7454d54d296e3b0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jul 8 06:46:15 2020 +0200 batctl: Sync batman-adv uapi headers Sync headers after following batman-adv changes: * batman-adv: Fix typos and grammar in documentation * batman-adv: Introduce a configurable per interface hop penalty Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6dcc536cfe1396d1ef61fad1e7454d54d296e3b0 batadv_packet.h | 50 +++++++++++++++++++++++++------------------------- batman_adv.h | 7 ++++--- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/batadv_packet.h b/batadv_packet.h index 0ae34c8..9c8604c 100644 --- a/batadv_packet.h +++ b/batadv_packet.h @@ -72,8 +72,8 @@ enum batadv_subtype { /** * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets - * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was - * previously received from someone else than the best neighbor. + * @BATADV_NOT_BEST_NEXT_HOP: flag is set when the ogm packet is forwarded and + * was previously received from someone other than the best neighbor. * @BATADV_PRIMARIES_FIRST_HOP: flag unused. * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a * one hop neighbor on the interface where it was originally received. @@ -195,8 +195,8 @@ struct batadv_bla_claim_dst { /** * struct batadv_ogm_packet - ogm (routing protocol) packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @flags: contains routing relevant flags - see enum batadv_iv_flags * @seqno: sequence identification * @orig: address of the source node @@ -247,7 +247,7 @@ struct batadv_ogm2_packet { /** * struct batadv_elp_packet - elp (neighbor discovery) packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header + * @version: batman-adv protocol version, part of the general header * @orig: originator mac address * @seqno: sequence number * @elp_interval: currently used ELP sending interval in ms @@ -265,15 +265,15 @@ struct batadv_elp_packet { /** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node * @uid: local ICMP socket identifier * @align: not used - useful for alignment purposes only * - * This structure is used for ICMP packets parsing only and it is never sent + * This structure is used for ICMP packet parsing only and it is never sent * over the wire. The alignment field at the end is there to ensure that * members are padded the same way as they are in real packets. */ @@ -291,8 +291,8 @@ struct batadv_icmp_header { /** * struct batadv_icmp_packet - ICMP packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -315,8 +315,8 @@ struct batadv_icmp_packet { /** * struct batadv_icmp_tp_packet - ICMP TP Meter packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -358,8 +358,8 @@ enum batadv_icmp_tp_subtype { /** * struct batadv_icmp_packet_rr - ICMP RouteRecord packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -397,8 +397,8 @@ struct batadv_icmp_packet_rr { /** * struct batadv_unicast_packet - unicast packet for network payload * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @ttvn: translation table version number * @dest: originator destination of the unicast packet */ @@ -433,8 +433,8 @@ struct batadv_unicast_4addr_packet { /** * struct batadv_frag_packet - fragmented packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @dest: final destination used when routing fragments * @orig: originator of the fragment used when merging the packet * @no: fragment number within this sequence @@ -467,8 +467,8 @@ struct batadv_frag_packet { /** * struct batadv_bcast_packet - broadcast packet for network payload * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @reserved: reserved byte for alignment * @seqno: sequence identification * @orig: originator of the broadcast packet @@ -488,10 +488,10 @@ struct batadv_bcast_packet { /** * struct batadv_coded_packet - network coded packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @first_source: original source of first included packet - * @first_orig_dest: original destinal of first included packet + * @first_orig_dest: original destination of first included packet * @first_crc: checksum of first included packet * @first_ttvn: tt-version number of first included packet * @second_ttl: ttl of second packet @@ -523,8 +523,8 @@ struct batadv_coded_packet { /** * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @ttl: time to live for this packet, part of the genereal header + * @version: batman-adv protocol version, part of the general header + * @ttl: time to live for this packet, part of the general header * @reserved: reserved field (for packet alignment) * @src: address of the source * @dst: address of the destination diff --git a/batman_adv.h b/batman_adv.h index 617c180..bb0ae94 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -69,7 +69,7 @@ enum batadv_tt_client_flags { /** * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be - * part of the network but no nnode has already announced it + * part of the network but no node has already announced it */ BATADV_TT_CLIENT_TEMP = (1 << 11), }; @@ -131,7 +131,7 @@ enum batadv_gw_modes { /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ BATADV_GW_MODE_CLIENT, - /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ + /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ BATADV_GW_MODE_SERVER, }; @@ -427,7 +427,8 @@ enum batadv_nl_attrs { /** * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied - * to an originator message's tq-field on every hop. + * to an originator message's tq-field on every hop and/or per + * hard interface */ BATADV_ATTR_HOP_PENALTY,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits