linux-merge October 2013

linux-merge@lists.open-mesh.org

2 participants
74 discussions

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 22 Oct '13

22 Oct '13

--- batman-adv_next.packet.h 2013-10-23 00:15:01.195167903 +0200 +++ batctl_next.packet.h 2013-10-23 00:15:01.199168167 +0200 @@ -239,8 +239,6 @@ uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; -#define BATADV_ICMP_MAX_PACKET_SIZE sizeof(struct batadv_icmp_packet_rr) - /* All packet headers in front of an ethernet header have to be completely * divisible by 2 but not by 4 to make the payload after the ethernet * header again 4 bytes boundary aligned.

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

--- batman-adv_master.packet.h 2013-10-15 00:15:01.360922226 +0200 +++ batctl_master.packet.h 2013-10-15 00:15:01.364922497 +0200 @@ -110,13 +110,12 @@ /* BATADV_TT_CLIENT flags. * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only. - * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. + * BIT(15) are used for local computation only */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0), BATADV_TT_CLIENT_ROAM = BIT(1), - BATADV_TT_CLIENT_WIFI = BIT(4), + BATADV_TT_CLIENT_WIFI = BIT(2), BATADV_TT_CLIENT_NOPURGE = BIT(8), BATADV_TT_CLIENT_NEW = BIT(9), BATADV_TT_CLIENT_PENDING = BIT(10),

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

--- batman-adv_next.packet.h 2013-10-15 00:15:01.360922226 +0200 +++ batctl_next.packet.h 2013-10-15 00:15:01.364922497 +0200 @@ -110,13 +110,12 @@ /* BATADV_TT_CLIENT flags. * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only. - * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. + * BIT(15) are used for local computation only */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0), BATADV_TT_CLIENT_ROAM = BIT(1), - BATADV_TT_CLIENT_WIFI = BIT(4), + BATADV_TT_CLIENT_WIFI = BIT(2), BATADV_TT_CLIENT_NOPURGE = BIT(8), BATADV_TT_CLIENT_NEW = BIT(9), BATADV_TT_CLIENT_PENDING = BIT(10),

1 0

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

12 Oct '13

--- batman-adv_next.packet.h 2013-10-13 00:15:02.001599698 +0200 +++ batctl_next.packet.h 2013-10-13 00:15:02.057600779 +0200 @@ -195,7 +195,7 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * batadv_icmp_header - common ICMP header + * batadc_icmp_header - common ICMP header * @header: common batman header * @msg_type: ICMP packet type * @dst: address of the destination node

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge October 2013