linux-merge July 2020

linux-merge@lists.open-mesh.org

3 participants
58 discussions

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 08 Jul '20

08 Jul '20

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/ls/click?upn=nJaKvJSIH-2FPAfmty-2BK5tYpPkl… Build ID: 325450 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Noticed difference in batman_adv.h in master.diff
by postmaster＠open-mesh.org 07 Jul '20

07 Jul '20

--- batman-adv_master.batman_adv.h 2020-07-08 00:05:01.772916767 +0200 +++ batctl_master.batman_adv.h 2020-07-08 00:05:01.776916806 +0200 @@ -69,7 +69,7 @@ /** * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be - * part of the network but no node has already announced it + * part of the network but no nnode has already announced it */ BATADV_TT_CLIENT_TEMP = (1 << 11), }; @@ -131,7 +131,7 @@ /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ BATADV_GW_MODE_CLIENT, - /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ + /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ BATADV_GW_MODE_SERVER, }; @@ -427,8 +427,7 @@ /** * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied - * to an originator message's tq-field on every hop and/or per - * hard interface + * to an originator message's tq-field on every hop. */ BATADV_ATTR_HOP_PENALTY,

1 0

Noticed difference in batadv_packet.h in master.diff
by postmaster＠open-mesh.org 07 Jul '20

07 Jul '20

--- batman-adv_master.packet.h 2020-07-08 00:05:01.772916767 +0200 +++ batctl_master.packet.h 2020-07-08 00:05:01.776916806 +0200 @@ -72,8 +72,8 @@ /** * 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 the ogm packet is forwarded and - * was previously received from someone other than the best neighbor. + * @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 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_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 general header - * @ttl: time to live for this packet, 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 * @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_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 general header + * @version: batman-adv protocol version, part of the genereal header * @orig: originator mac address * @seqno: sequence number * @elp_interval: currently used ELP sending interval in ms @@ -265,15 +265,15 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @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 packet parsing only and it is never sent + * This structure is used for ICMP packets 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_packet - ICMP packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -315,8 +315,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -358,8 +358,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -397,8 +397,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @ttvn: translation table version number * @dest: originator destination of the unicast packet */ @@ -433,8 +433,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @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_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 general header - * @ttl: time to live for this packet, 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: reserved byte for alignment * @seqno: sequence identification * @orig: originator of the broadcast packet @@ -488,10 +488,10 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @first_source: original source of first included packet - * @first_orig_dest: original destination of first included packet + * @first_orig_dest: original destinal 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_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 general header - * @ttl: time to live for this packet, 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: reserved field (for packet alignment) * @src: address of the source * @dst: address of the destination

1 0

Noticed difference in batman_adv.h in alfred.master.diff
by postmaster＠open-mesh.org 07 Jul '20

07 Jul '20

--- batman-adv_master.batman_adv.h 2020-07-08 00:05:01.772916767 +0200 +++ alfred_master.batman_adv.h 2020-07-08 00:05:01.780916845 +0200 @@ -69,7 +69,7 @@ /** * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be - * part of the network but no node has already announced it + * part of the network but no nnode has already announced it */ BATADV_TT_CLIENT_TEMP = (1 << 11), }; @@ -131,7 +131,7 @@ /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ BATADV_GW_MODE_CLIENT, - /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ + /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ BATADV_GW_MODE_SERVER, }; @@ -427,8 +427,7 @@ /** * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied - * to an originator message's tq-field on every hop and/or per - * hard interface + * to an originator message's tq-field on every hop. */ BATADV_ATTR_HOP_PENALTY,

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 06 Jul '20

06 Jul '20

Your request for analysis of batctl has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/ls/click?upn=nJaKvJSIH-2FPAfmty-2BK5tYpPkl… Build ID: 325032 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 06 Jul '20

06 Jul '20

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/ls/click?upn=nJaKvJSIH-2FPAfmty-2BK5tYpPkl… Build ID: 325031 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Noticed difference in batman_adv.h in master.diff
by postmaster＠open-mesh.org 06 Jul '20

06 Jul '20

--- batman-adv_master.batman_adv.h 2020-07-07 00:05:01.555428696 +0200 +++ batctl_master.batman_adv.h 2020-07-07 00:05:01.559428734 +0200 @@ -69,7 +69,7 @@ /** * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be - * part of the network but no node has already announced it + * part of the network but no nnode has already announced it */ BATADV_TT_CLIENT_TEMP = (1 << 11), }; @@ -131,7 +131,7 @@ /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ BATADV_GW_MODE_CLIENT, - /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ + /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ BATADV_GW_MODE_SERVER, }; @@ -427,8 +427,7 @@ /** * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied - * to an originator message's tq-field on every hop and/or per - * hard interface + * to an originator message's tq-field on every hop. */ BATADV_ATTR_HOP_PENALTY,

1 0

Noticed difference in batadv_packet.h in master.diff
by postmaster＠open-mesh.org 06 Jul '20

06 Jul '20

--- batman-adv_master.packet.h 2020-07-07 00:05:01.551428656 +0200 +++ batctl_master.packet.h 2020-07-07 00:05:01.555428696 +0200 @@ -72,8 +72,8 @@ /** * 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 the ogm packet is forwarded and - * was previously received from someone other than the best neighbor. + * @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 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_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 general header - * @ttl: time to live for this packet, 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 * @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_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 general header + * @version: batman-adv protocol version, part of the genereal header * @orig: originator mac address * @seqno: sequence number * @elp_interval: currently used ELP sending interval in ms @@ -265,15 +265,15 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @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 packet parsing only and it is never sent + * This structure is used for ICMP packets 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_packet - ICMP packet * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -315,8 +315,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -358,8 +358,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @msg_type: ICMP packet type * @dst: address of the destination node * @orig: address of the source node @@ -397,8 +397,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @ttvn: translation table version number * @dest: originator destination of the unicast packet */ @@ -433,8 +433,8 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @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_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 general header - * @ttl: time to live for this packet, 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: reserved byte for alignment * @seqno: sequence identification * @orig: originator of the broadcast packet @@ -488,10 +488,10 @@ /** * 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 general header - * @ttl: time to live for this packet, 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 * @first_source: original source of first included packet - * @first_orig_dest: original destination of first included packet + * @first_orig_dest: original destinal 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_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 general header - * @ttl: time to live for this packet, 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: reserved field (for packet alignment) * @src: address of the source * @dst: address of the destination

1 0

Noticed difference in batman_adv.h in alfred.master.diff
by postmaster＠open-mesh.org 06 Jul '20

06 Jul '20

--- batman-adv_master.batman_adv.h 2020-07-07 00:05:01.555428696 +0200 +++ alfred_master.batman_adv.h 2020-07-07 00:05:01.563428773 +0200 @@ -69,7 +69,7 @@ /** * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be - * part of the network but no node has already announced it + * part of the network but no nnode has already announced it */ BATADV_TT_CLIENT_TEMP = (1 << 11), }; @@ -131,7 +131,7 @@ /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */ BATADV_GW_MODE_CLIENT, - /** @BATADV_GW_MODE_SERVER: announce itself as gateway server */ + /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */ BATADV_GW_MODE_SERVER, }; @@ -427,8 +427,7 @@ /** * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied - * to an originator message's tq-field on every hop and/or per - * hard interface + * to an originator message's tq-field on every hop. */ BATADV_ATTR_HOP_PENALTY,

1 0

Build check errors found: 2020-07-06
by postmaster＠open-mesh.org 06 Jul '20

06 Jul '20

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/bat_iv_ogm.c | 4 +- net/net/batman-adv/bat_v_elp.c | 17 +--------- net/net/batman-adv/bat_v_ogm.c | 4 +- net/net/batman-adv/distributed-arp-table.h | 5 --- net/net/batman-adv/gateway_client.c | 4 +- net/net/batman-adv/hard-interface.c | 4 +- net/net/batman-adv/icmp_socket.c | 3 - net/net/batman-adv/main.h | 2 - net/net/batman-adv/routing.c | 4 +- net/net/batman-adv/soft-interface.c | 33 ++++++++++++++++++++ net/net/batman-adv/trace.h | 1 net/net/batman-adv/types.h | 2 - 12 files changed, 47 insertions(+), 36 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/Documentation/networking/batman-adv.rst | 8 ++-- netnext/include/uapi/linux/batman_adv.h | 7 ++- netnext/net/batman-adv/bat_iv_ogm.c | 25 +++++++------ netnext/net/batman-adv/bat_v_elp.c | 10 ++--- netnext/net/batman-adv/bat_v_ogm.c | 27 +++++++++------ netnext/net/batman-adv/bridge_loop_avoidance.c | 6 +-- netnext/net/batman-adv/distributed-arp-table.c | 2 - netnext/net/batman-adv/fragmentation.c | 6 +-- netnext/net/batman-adv/hard-interface.c | 16 +++++--- netnext/net/batman-adv/log.h | 6 +-- netnext/net/batman-adv/main.c | 2 - netnext/net/batman-adv/main.h | 8 ++-- netnext/net/batman-adv/multicast.c | 21 ++++++----- netnext/net/batman-adv/netlink.c | 14 ++++++- netnext/net/batman-adv/network-coding.c | 14 +++---- netnext/net/batman-adv/originator.c | 8 ++-- netnext/net/batman-adv/routing.c | 4 +- netnext/net/batman-adv/send.c | 4 +- netnext/net/batman-adv/soft-interface.c | 2 - netnext/net/batman-adv/tp_meter.c | 12 +++--- netnext/net/batman-adv/translation-table.c | 10 ++--- netnext/net/batman-adv/tvlv.c | 4 +- netnext/net/batman-adv/types.h | 18 ++++++---- 23 files changed, 131 insertions(+), 103 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 112 Tested Linux versions: 30 Tested configs: 101 maint ----- Failed tests: 1 Started build tests: 109 Tested Linux versions: 32 Tested configs: 103

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge July 2020