commits September 2015

commits@lists.open-mesh.org

1 participants
41 discussions

[batctl] master: batctl: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag (e3bbef5)
by postmaster＠open-mesh.org 27 Sep '15

27 Sep '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e3bbef54d1197fd975591a42974f050867a9d1e4 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Aug 9 23:56:50 2015 +0800 batctl: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e3bbef54d1197fd975591a42974f050867a9d1e4 packet.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packet.h b/packet.h index 9c438db..72fd5b0 100644 --- a/packet.h +++ b/packet.h @@ -72,8 +72,7 @@ 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_PRIMARIES_FIRST_HOP: flag is set when the primary interface address - * is used, and the packet travels its first hop. + * @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. */

1 0

[batman-adv] master: batman-adv: kernel doc readability updates (425ba69)
by postmaster＠open-mesh.org 26 Sep '15

26 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 425ba692c62916ef4395d3be9cd3b1f896d486e3 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Aug 15 18:04:59 2015 +0800 batman-adv: kernel doc readability updates Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 425ba692c62916ef4395d3be9cd3b1f896d486e3 net/batman-adv/types.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 8c3dda3..7f7a0f1 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -73,7 +73,7 @@ enum batadv_dhcp_recipient { #define BATADV_TT_SYNC_MASK 0x00F0 /** - * struct batadv_hard_iface_bat_iv - per hard interface B.A.T.M.A.N. IV data + * struct batadv_hard_iface_bat_iv - per hard-interface B.A.T.M.A.N. IV data * @ogm_buff: buffer holding the OGM packet * @ogm_buff_len: length of the OGM packet buffer * @ogm_seqno: OGM sequence number - used to identify each OGM @@ -97,8 +97,8 @@ struct batadv_hard_iface_bat_iv { * batman-adv for this interface * @soft_iface: the batman-adv interface which uses this network interface * @rcu: struct used for freeing in an RCU-safe manner - * @bat_iv: BATMAN IV specific per hard interface data - * @cleanup_work: work queue callback item for hard interface deinit + * @bat_iv: per hard-interface B.A.T.M.A.N. IV data + * @cleanup_work: work queue callback item for hard-interface deinit * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs * @neigh_list: list of unique single hop neighbors via this interface * @neigh_list_lock: lock protecting neigh_list @@ -125,7 +125,7 @@ struct batadv_hard_iface { /** * struct batadv_orig_ifinfo - originator info per outgoing interface * @list: list node for orig_node::ifinfo_list - * @if_outgoing: pointer to outgoing hard interface + * @if_outgoing: pointer to outgoing hard-interface * @router: router that should be used to reach this originator * @last_real_seqno: last and best known sequence number * @last_ttl: ttl of last received packet @@ -202,7 +202,7 @@ struct batadv_orig_node_vlan { /** * struct batadv_orig_bat_iv - B.A.T.M.A.N. IV private orig_node members - * @bcast_own: set of bitfields (one per hard interface) where each one counts + * @bcast_own: set of bitfields (one per hard-interface) where each one counts * the number of our OGMs this orig_node rebroadcasted "back" to us (relative * to last_real_seqno). Every bitfield is BATADV_TQ_LOCAL_WINDOW_SIZE bits long. * @bcast_own_sum: sum of bcast_own @@ -346,10 +346,11 @@ struct batadv_gw_node { }; /** - * struct batadv_hardif_neigh_node - unique neighbor per hard interface + * struct batadv_hardif_neigh_node - unique neighbor per hard-interface * @list: list node for batadv_hard_iface::neigh_list * @addr: the MAC address of the neighboring interface - * @if_incoming: pointer to incoming hard interface + * @if_incoming: pointer to incoming hard-interface + * @last_seen: when last packet via this neighbor was received * @refcount: number of contexts the object is used * @rcu: struct used for freeing in a RCU-safe manner */ @@ -369,7 +370,7 @@ struct batadv_hardif_neigh_node { * @addr: the MAC address of the neighboring interface * @ifinfo_list: list for routing metrics per outgoing interface * @ifinfo_lock: lock protecting private ifinfo members and list - * @if_incoming: pointer to incoming hard interface + * @if_incoming: pointer to incoming hard-interface * @last_seen: when last packet via this neighbor was received * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner @@ -388,7 +389,7 @@ struct batadv_neigh_node { /** * struct batadv_neigh_ifinfo_bat_iv - neighbor information per outgoing - * interface for BATMAN IV + * interface for B.A.T.M.A.N. IV * @tq_recv: ring buffer of received TQ values from this neigh node * @tq_index: ring buffer index * @tq_avg: averaged tq of all tq values in the ring buffer (tq_recv) @@ -407,7 +408,7 @@ struct batadv_neigh_ifinfo_bat_iv { /** * struct batadv_neigh_ifinfo - neighbor information per outgoing interface * @list: list node for batadv_neigh_node::ifinfo_list - * @if_outgoing: pointer to outgoing hard interface + * @if_outgoing: pointer to outgoing hard-interface * @bat_iv: B.A.T.M.A.N. IV private structure * @last_ttl: last received ttl from this neigh node * @refcount: number of contexts the object is used @@ -783,8 +784,8 @@ struct batadv_softif_vlan { * @forw_bat_list_lock: lock protecting forw_bat_list * @forw_bcast_list_lock: lock protecting forw_bcast_list * @orig_work: work queue callback item for orig node purging - * @cleanup_work: work queue callback item for soft interface deinit - * @primary_if: one of the hard interfaces assigned to this mesh interface + * @cleanup_work: work queue callback item for soft-interface deinit + * @primary_if: one of the hard-interfaces assigned to this mesh interface * becomes the primary interface * @bat_algo_ops: routing algorithm used by this mesh interface * @softif_vlan_list: a list of softif_vlan structs, one per VLAN created on top

1 0

[batman-adv] master: batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag (f7b3226)
by postmaster＠open-mesh.org 26 Sep '15

26 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f7b3226d3ba9940aa38b30fa2a28498e5b0abadf Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Aug 9 23:56:50 2015 +0800 batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f7b3226d3ba9940aa38b30fa2a28498e5b0abadf net/batman-adv/bat_iv_ogm.c | 3 --- net/batman-adv/packet.h | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 2f532b7..ad678f0 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -361,7 +361,6 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff; batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; - batadv_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP; batadv_ogm_packet->ttl = BATADV_TTL; } @@ -842,8 +841,6 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, "Forwarding packet: tq: %i, ttl: %i\n", batadv_ogm_packet->tq, batadv_ogm_packet->ttl); - /* switch of primaries first hop flag when forwarding */ - batadv_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP; if (is_single_hop_neigh) batadv_ogm_packet->flags |= BATADV_DIRECTLINK; else diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 9c438db..72fd5b0 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -72,8 +72,7 @@ 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_PRIMARIES_FIRST_HOP: flag is set when the primary interface address - * is used, and the packet travels its first hop. + * @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. */

1 0

[alfred] master: alfred: Fix typos (244b3ff)
by postmaster＠open-mesh.org 18 Sep '15

18 Sep '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 244b3ffe5f0bb23fd4750de1c7ddd18b712351ae Author: Ulrich Ölmann <u.oelmann(a)pengutronix.de> Date: Wed Sep 16 15:01:49 2015 +0200 alfred: Fix typos Signed-off-by: Ulrich Ölmann <u.oelmann(a)pengutronix.de> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 244b3ffe5f0bb23fd4750de1c7ddd18b712351ae README | 2 +- main.c | 4 ++-- man/alfred.8 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 938a275..6bbf915 100644 --- a/README +++ b/README @@ -74,7 +74,7 @@ list of options, run alfred -h): the system (default: bat0). use 'none' to disable the batman-adv based best server selection -m, --master start up the daemon in master mode, which - accepts data from slaves and synces it with + accepts data from slaves and syncs it with other masters The -b option is optional, and only needed if you run alfred on a batman-adv diff --git a/main.c b/main.c index db1f8b0..452d9ae 100644 --- a/main.c +++ b/main.c @@ -50,13 +50,13 @@ static void alfred_usage(void) printf(" -I, --change-interface [interface] change to the specified interface(s)\n"); printf("\n"); printf("server mode options:\n"); - printf(" -i, --interface specify the interface (or comma separated list of interfaes) to listen on\n"); + printf(" -i, --interface specify the interface (or comma separated list of interfaces) to listen on\n"); printf(" -b specify the batman-adv interface\n"); printf(" configured on the system (default: bat0)\n"); printf(" use 'none' to disable the batman-adv\n"); printf(" based best server selection\n"); printf(" -m, --master start up the daemon in master mode, which\n"); - printf(" accepts data from slaves and synces it with\n"); + printf(" accepts data from slaves and syncs it with\n"); printf(" other masters\n"); printf("\n"); printf(" -u, --unix-path [path] path to unix socket used for client-server\n"); diff --git a/man/alfred.8 b/man/alfred.8 index e21bb55..95241a7 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -90,7 +90,7 @@ Change the alfred server to use the new \fBinterface\fP(s) .SH SERVER OPTIONS .TP \fB\-i\fP, \fB\-\-interface\fP \fiface\fP -Specify the interface (or comma separated list of interfaes) to listen on +Specify the interface (or comma separated list of interfaces) to listen on .TP \fB\-b\fP \fIbatmanif\fP Specify the batman-adv interface configured on the system (default: bat0). @@ -102,7 +102,7 @@ batman-adv interface not called bat0, or if you don't use batman-adv at all able to find the best next master server based on metrics. .TP \fB\-m\fP, \fB\-\-master\fP -Start up the daemon in master mode, which accepts data from slaves and synces +Start up the daemon in master mode, which accepts data from slaves and syncs it with other masters. alfred servers may either run as master or slave in the network. Masters will

1 0

[batman-adv] master: batman-adv: Fix kerneldoc parsing of return description (b615fba)
by postmaster＠open-mesh.org 18 Sep '15

18 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b615fbabb138c0a91035f49cf6c36cb872adb146 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Sep 15 19:00:48 2015 +0200 batman-adv: Fix kerneldoc parsing of return description Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- net/batman-adv/bat_iv_ogm.c | 18 +++---- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 11 +++-- net/batman-adv/bridge_loop_avoidance.c | 68 ++++++++++++++++++-------- net/batman-adv/distributed-arp-table.c | 37 +++++++------- net/batman-adv/fragmentation.c | 17 ++++--- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 14 +++--- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/hard-interface.c | 7 +-- net/batman-adv/hash.h | 22 +++++---- net/batman-adv/main.c | 26 +++++----- net/batman-adv/main.h | 13 +++-- net/batman-adv/multicast.c | 35 +++++++------- net/batman-adv/network-coding.c | 42 ++++++++-------- net/batman-adv/originator.c | 48 +++++++++++-------- net/batman-adv/routing.c | 30 +++++++----- net/batman-adv/send.c | 24 +++++----- net/batman-adv/send.h | 4 +- net/batman-adv/soft-interface.c | 14 +++--- net/batman-adv/sysfs.c | 10 ++-- net/batman-adv/translation-table.c | 88 ++++++++++++++++++++-------------- 22 files changed, 305 insertions(+), 229 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b615fbabb138c0a91035f49cf6c36cb872adb146

1 0

[batctl] master: batctl: Fix names in kerneldoc of functions (20a46cb)
by postmaster＠open-mesh.org 15 Sep '15

15 Sep '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 20a46cb9b2decd8da4bcc23f98e935f88f92e61c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 6 21:38:51 2015 +0200 batctl: Fix names in kerneldoc of functions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 20a46cb9b2decd8da4bcc23f98e935f88f92e61c packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 456b54e..9c438db 100644 --- a/packet.h +++ b/packet.h @@ -495,7 +495,7 @@ struct batadv_tvlv_gateway_data { * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number - * @vlan_num: number of announced VLANs. In the TVLV this struct is followed by + * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by * one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data {

1 0

[batctl] master: batctl: Fix kerneldoc parsing of structs/enums (9d05a4d)
by postmaster＠open-mesh.org 15 Sep '15

15 Sep '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 9d05a4d34233c54218e1eb5eae6e1b5aa1117f5f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 6 21:38:49 2015 +0200 batctl: Fix kerneldoc parsing of structs/enums Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9d05a4d34233c54218e1eb5eae6e1b5aa1117f5f packet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packet.h b/packet.h index 11f996b..c5973a1 100644 --- a/packet.h +++ b/packet.h @@ -159,7 +159,7 @@ enum batadv_tt_client_flags { }; /** - * batadv_vlan_flags - flags for the four MSB of any vlan ID field + * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not */ enum batadv_vlan_flags { @@ -231,7 +231,7 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * batadv_icmp_header - common members among all the ICMP packets + * 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 @@ -257,7 +257,7 @@ struct batadv_icmp_header { }; /** - * batadv_icmp_packet - ICMP packet + * 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 @@ -283,7 +283,7 @@ struct batadv_icmp_packet { #define BATADV_RR_LEN 16 /** - * batadv_icmp_packet_rr - ICMP RouteRecord packet + * 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

1 0

[batctl] master: batctl: Remove kerneldoc for missing parameters (3ba1664)
by postmaster＠open-mesh.org 15 Sep '15

15 Sep '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3ba1664639b21cde8cf1482d7293ad7d60d83019 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 6 21:38:50 2015 +0200 batctl: Remove kerneldoc for missing parameters Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3ba1664639b21cde8cf1482d7293ad7d60d83019 packet.h | 1 - 1 file changed, 1 deletion(-) diff --git a/packet.h b/packet.h index c5973a1..456b54e 100644 --- a/packet.h +++ b/packet.h @@ -414,7 +414,6 @@ struct batadv_bcast_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 - * @reserved: Align following fields to 2-byte boundaries * @first_source: original source of first included packet * @first_orig_dest: original destinal of first included packet * @first_crc: checksum of first included packet

1 0

[batman-adv] master: batman-adv: Place constant on right side of comparison (cef7403)
by postmaster＠open-mesh.org 14 Sep '15

14 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cef7403c2ec6f3051dfb2f8e4448276b87092097 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 13 09:44:45 2015 +0200 batman-adv: Place constant on right side of comparison checkpatch warns when the constant is on the left side of a comparison. Fixes: 56fd0bab9c18 ("batman-adv: Fix gw_bandwidth calculation on 32 bit systems") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- cef7403c2ec6f3051dfb2f8e4448276b87092097 net/batman-adv/gateway_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 0cb5e6b..66d9514 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -89,7 +89,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, break; } - if (U32_MAX < ldown) { + if (ldown > U32_MAX) { batadv_err(net_dev, "Download speed of gateway mode too large: %s\n", buff); @@ -139,7 +139,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, break; } - if (U32_MAX < lup) { + if (lup > U32_MAX) { batadv_err(net_dev, "Upload speed of gateway mode too large: %s\n", slash_ptr + 1);

1 0

[batman-adv] master: batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs (cb6dfb4)
by postmaster＠open-mesh.org 14 Sep '15

14 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cb6dfb421034ed0e03acd2d4385ee271d779898f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 6 21:38:53 2015 +0200 batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- cb6dfb421034ed0e03acd2d4385ee271d779898f net/batman-adv/sysfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 9de3c88..888cd16 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -612,9 +612,7 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { BATADV_ATTR_VLAN_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); -/** - * batadv_vlan_attrs - array of vlan specific sysfs attributes - */ +/* array of vlan specific sysfs attributes */ static struct batadv_attribute *batadv_vlan_attrs[] = { &batadv_attr_vlan_ap_isolation, NULL,

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2015