linux-merge November 2015

linux-merge@lists.open-mesh.org

2 participants
48 discussions

Build check errors found (B.A.T.M.A.N. V): 2015-11-30
by postmaster＠open-mesh.org 30 Nov '15

30 Nov '15

Name of failed tests ==================== * checkpatch batman_v ./net/batman-adv/bat_v_ogm.c Output of different failed tests ================================ checkpatch batman_v ./net/batman-adv/bat_v_ogm.c ------------------------------------------------ WARNING: line over 80 characters #317: FILE: ./net/batman-adv/bat_v_ogm.c:317: + * - throughput if the outgoing interface is the default interface WARNING: line over 80 characters #318: FILE: ./net/batman-adv/bat_v_ogm.c:318: + * (i.e. this OGM is processed for the internal table total: 0 errors, 2 warnings, 0 checks, 840 lines checked

1 0

Build check errors found: 2015-11-30
by postmaster＠open-mesh.org 30 Nov '15

30 Nov '15

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/networking/batman-adv.txt | 9 net/batman-adv/bat_iv_ogm.c | 92 +------ net/batman-adv/bitarray.c | 12 net/batman-adv/bitarray.h | 12 net/batman-adv/bridge_loop_avoidance.c | 282 +++++------------------ net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 15 - net/batman-adv/distributed-arp-table.c | 46 +-- net/batman-adv/fragmentation.c | 26 -- net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 119 +++++---- net/batman-adv/hard-interface.c | 11 net/batman-adv/hash.h | 22 - net/batman-adv/main.c | 51 ++-- net/batman-adv/main.h | 21 - net/batman-adv/multicast.c | 35 +- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 59 +--- net/batman-adv/originator.c | 241 +------------------ net/batman-adv/originator.h | 7 net/batman-adv/packet.h | 20 - net/batman-adv/routing.c | 61 +--- net/batman-adv/send.c | 32 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 31 -- net/batman-adv/translation-table.c | 155 ++++-------- net/batman-adv/types.h | 90 ++----- 29 files changed, 450 insertions(+), 1041 deletions(-)

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 29 Nov '15

29 Nov '15

--- batman-adv_next.packet.h 2015-11-30 00:05:01.979991635 +0100 +++ batctl_next.packet.h 2015-11-30 00:05:01.983991906 +0100 @@ -72,7 +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 ogm packet is forwarded and was * previously received from someone else than the best neighbor. - * @BATADV_PRIMARIES_FIRST_HOP: flag unused. + * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address + * is used, and the packet travels its first hop. * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a * one hop neighbor on the interface where it was originally received. */ @@ -158,7 +159,7 @@ }; /** - * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field + * 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 { @@ -209,11 +210,6 @@ * @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 - * @prev_sender: address of the previous sender - * @reserved: reserved byte for alignment - * @tq: transmission quality * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { @@ -235,7 +231,7 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_icmp_header - common members among all the ICMP packets + * 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 @@ -261,7 +257,7 @@ }; /** - * struct batadv_icmp_packet - ICMP packet + * 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 @@ -287,7 +283,7 @@ #define BATADV_RR_LEN 16 /** - * struct batadv_icmp_packet_rr - ICMP RouteRecord packet + * 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 @@ -350,7 +346,6 @@ * @u: common unicast packet header * @src: address of the source * @subtype: packet subtype - * @reserved: reserved byte for alignment */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; @@ -419,6 +414,7 @@ * @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 @@ -500,7 +496,7 @@ * 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 - * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by + * @vlan_num: 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

Build check errors found (B.A.T.M.A.N. V): 2015-11-29
by postmaster＠open-mesh.org 29 Nov '15

29 Nov '15

1 0

Build check errors found: 2015-11-29
by postmaster＠open-mesh.org 29 Nov '15

29 Nov '15

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 28 Nov '15

28 Nov '15

--- batman-adv_next.packet.h 2015-11-29 00:05:01.169807226 +0100 +++ batctl_next.packet.h 2015-11-29 00:05:01.173807493 +0100 @@ -72,7 +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 ogm packet is forwarded and was * previously received from someone else than the best neighbor. - * @BATADV_PRIMARIES_FIRST_HOP: flag unused. + * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address + * is used, and the packet travels its first hop. * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a * one hop neighbor on the interface where it was originally received. */ @@ -158,7 +159,7 @@ }; /** - * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field + * 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 { @@ -209,11 +210,6 @@ * @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 - * @prev_sender: address of the previous sender - * @reserved: reserved byte for alignment - * @tq: transmission quality * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { @@ -235,7 +231,7 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_icmp_header - common members among all the ICMP packets + * 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 @@ -261,7 +257,7 @@ }; /** - * struct batadv_icmp_packet - ICMP packet + * 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 @@ -287,7 +283,7 @@ #define BATADV_RR_LEN 16 /** - * struct batadv_icmp_packet_rr - ICMP RouteRecord packet + * 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 @@ -350,7 +346,6 @@ * @u: common unicast packet header * @src: address of the source * @subtype: packet subtype - * @reserved: reserved byte for alignment */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; @@ -419,6 +414,7 @@ * @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 @@ -500,7 +496,7 @@ * 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 - * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by + * @vlan_num: 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

Build check errors found (B.A.T.M.A.N. V): 2015-11-28
by postmaster＠open-mesh.org 28 Nov '15

28 Nov '15

1 0

Build check errors found: 2015-11-28
by postmaster＠open-mesh.org 28 Nov '15

28 Nov '15

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 27 Nov '15

27 Nov '15

--- batman-adv_next.packet.h 2015-11-28 00:05:01.594866341 +0100 +++ batctl_next.packet.h 2015-11-28 00:05:01.774878322 +0100 @@ -72,7 +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 ogm packet is forwarded and was * previously received from someone else than the best neighbor. - * @BATADV_PRIMARIES_FIRST_HOP: flag unused. + * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address + * is used, and the packet travels its first hop. * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a * one hop neighbor on the interface where it was originally received. */ @@ -158,7 +159,7 @@ }; /** - * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field + * 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 { @@ -209,11 +210,6 @@ * @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 - * @prev_sender: address of the previous sender - * @reserved: reserved byte for alignment - * @tq: transmission quality * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { @@ -235,7 +231,7 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_icmp_header - common members among all the ICMP packets + * 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 @@ -261,7 +257,7 @@ }; /** - * struct batadv_icmp_packet - ICMP packet + * 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 @@ -287,7 +283,7 @@ #define BATADV_RR_LEN 16 /** - * struct batadv_icmp_packet_rr - ICMP RouteRecord packet + * 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 @@ -350,7 +346,6 @@ * @u: common unicast packet header * @src: address of the source * @subtype: packet subtype - * @reserved: reserved byte for alignment */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; @@ -419,6 +414,7 @@ * @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 @@ -500,7 +496,7 @@ * 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 - * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by + * @vlan_num: 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

Build check errors found: 2015-11-27
by postmaster＠open-mesh.org 27 Nov '15

27 Nov '15

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2015