linux-merge

linux-merge@lists.open-mesh.org

2 participants
7455 discussions

Build check errors found: 2012-06-10
by postmaster＠open-mesh.org 09 Jun '12

09 Jun '12

Name of failed tests ==================== cppcheck master Output of different failed tests ================================ cppcheck master: >>>>>>>> (information) Cppcheck cannot find all the include files (use --check-config for details)

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 09 Jun '12

09 Jun '12

--- batman-adv_master.packet.h 2012-06-10 00:15:01.516139895 +0200 +++ batctl_master.packet.h 2012-06-10 00:15:01.520135718 +0200 @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_PACKET_H_ #define _NET_BATMAN_ADV_PACKET_H_ -#define BATADV_ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ +#define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { BAT_IV_OGM = 0x01, @@ -34,7 +34,7 @@ }; /* this file is included by batctl which needs these defines */ -#define BATADV_COMPAT_VERSION 14 +#define COMPAT_VERSION 14 enum batman_iv_flags { NOT_BEST_NEXT_HOP = 1 << 3, @@ -65,7 +65,7 @@ }; /* TT_QUERY subtypes */ -#define BATADV_TT_QUERY_TYPE_MASK 0x3 +#define TT_QUERY_TYPE_MASK 0x3 enum tt_query_packettype { TT_REQUEST = 0, @@ -126,7 +126,7 @@ __be16 tt_crc; } __packed; -#define BATADV_OGM_HLEN sizeof(struct batman_ogm_packet) +#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet) struct icmp_packet { struct batman_header header; @@ -138,7 +138,7 @@ uint8_t reserved; } __packed; -#define BATADV_RR_LEN 16 +#define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet * as this is assumed by code that handles ICMP packets @@ -151,7 +151,7 @@ __be16 seqno; uint8_t uid; uint8_t rr_cur; - uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; + uint8_t rr[BAT_RR_LEN][ETH_ALEN]; } __packed; struct unicast_packet {

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 31 May '12

31 May '12

--- batman-adv_master.packet.h 2012-06-01 00:15:01.775195558 +0200 +++ batctl_master.packet.h 2012-06-01 00:15:01.779137886 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 30 May '12

30 May '12

--- batman-adv_master.packet.h 2012-05-31 00:15:01.740148692 +0200 +++ batctl_master.packet.h 2012-05-31 00:15:01.744147262 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 29 May '12

29 May '12

--- batman-adv_master.packet.h 2012-05-30 00:15:01.624278132 +0200 +++ batctl_master.packet.h 2012-05-30 00:15:01.863276464 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 28 May '12

28 May '12

--- batman-adv_master.packet.h 2012-05-29 00:15:01.415138585 +0200 +++ batctl_master.packet.h 2012-05-29 00:15:01.448135658 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 27 May '12

27 May '12

--- batman-adv_master.packet.h 2012-05-28 00:15:01.411140821 +0200 +++ batctl_master.packet.h 2012-05-28 00:15:01.451147999 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 26 May '12

26 May '12

--- batman-adv_master.packet.h 2012-05-27 00:15:01.731228873 +0200 +++ batctl_master.packet.h 2012-05-27 00:15:01.735137516 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 25 May '12

25 May '12

--- batman-adv_master.packet.h 2012-05-26 00:15:01.352278531 +0200 +++ batctl_master.packet.h 2012-05-26 00:15:01.376218283 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 24 May '12

24 May '12

--- batman-adv_master.packet.h 2012-05-25 00:15:01.811144585 +0200 +++ batctl_master.packet.h 2012-05-25 00:15:01.811144585 +0200 @@ -23,14 +23,14 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 }; /* this file is included by batctl which needs these defines */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge