linux-merge

linux-merge@lists.open-mesh.org

2 participants
7455 discussions

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

23 May '12

--- batman-adv_master.packet.h 2012-05-24 00:15:02.059262268 +0200 +++ batctl_master.packet.h 2012-05-24 00:15:02.159141100 +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 22 May '12

22 May '12

--- batman-adv_master.packet.h 2012-05-23 00:15:01.236144356 +0200 +++ batctl_master.packet.h 2012-05-23 00:15:01.267139607 +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

Build check errors found: 2012-05-22
by postmaster＠open-mesh.org 21 May '12

21 May '12

Name of failed tests ==================== sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> /home/batman/build_test/tmp/bat_debugfs.c: In function 'batadv_dbg': /home/batman/build_test/tmp/main.h:198: sorry, unimplemented: function 'batadv_dbg' can never be inlined because it uses variable argument lists make[2]: *** [/home/batman/build_test/tmp/bat_debugfs.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2

1 0

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

21 May '12

--- batman-adv_next.packet.h 2012-05-22 00:15:02.003134144 +0200 +++ batctl_next.packet.h 2012-05-22 00:15:02.027216117 +0200 @@ -25,14 +25,22 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + 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_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

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

21 May '12

--- batman-adv_master.packet.h 2012-05-22 00:15:01.999134796 +0200 +++ batctl_master.packet.h 2012-05-22 00:15:02.027216117 +0200 @@ -23,14 +23,22 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + 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_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

Build check errors found: 2012-05-21
by postmaster＠open-mesh.org 20 May '12

20 May '12

Name of failed tests ==================== sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> /home/batman/build_test/tmp/bat_debugfs.c: In function 'batadv_dbg': /home/batman/build_test/tmp/main.h:198: sorry, unimplemented: function 'batadv_dbg' can never be inlined because it uses variable argument lists make[2]: *** [/home/batman/build_test/tmp/bat_debugfs.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2

1 0

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

20 May '12

--- batman-adv_master.packet.h 2012-05-21 00:15:01.931228408 +0200 +++ batctl_master.packet.h 2012-05-21 00:15:01.940274858 +0200 @@ -23,14 +23,22 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + 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_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

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

20 May '12

--- batman-adv_next.packet.h 2012-05-21 00:15:01.931228408 +0200 +++ batctl_next.packet.h 2012-05-21 00:15:01.963248539 +0200 @@ -25,14 +25,22 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + 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_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

Build check errors found: 2012-05-20
by postmaster＠open-mesh.org 19 May '12

19 May '12

Name of failed tests ==================== sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> /home/batman/build_test/tmp/bat_debugfs.c: In function 'batadv_dbg': /home/batman/build_test/tmp/main.h:198: sorry, unimplemented: function 'batadv_dbg' can never be inlined because it uses variable argument lists make[2]: *** [/home/batman/build_test/tmp/bat_debugfs.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2

1 0

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

19 May '12

--- batman-adv_next.packet.h 2012-05-20 00:15:01.127136078 +0200 +++ batctl_next.packet.h 2012-05-20 00:15:01.155256709 +0200 @@ -25,14 +25,22 @@ #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_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + 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_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge