Patchset applied On Wed, 2020-04-01 at 17:04 -0700, Inga Stotland wrote: > --- > mesh/mesh-config-json.c | 1 - > mesh/mesh-defs.h | 1 + > mesh/net.h | 1 - > 3 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c > index ad2d4d0f8..172e0e355 100644 > --- a/mesh/mesh-config-json.c > +++ b/mesh/mesh-config-json.c > @@ -40,7 +40,6 @@ > #include "mesh/mesh-defs.h" > #include "mesh/util.h" > #include "mesh/mesh-config.h" > -#include "mesh/net.h" > > /* To prevent local node JSON cache thrashing, minimum update times */ > #define MIN_SEQ_CACHE_TRIGGER 32 > diff --git a/mesh/mesh-defs.h b/mesh/mesh-defs.h > index 9353d7351..bbde53303 100644 > --- a/mesh/mesh-defs.h > +++ b/mesh/mesh-defs.h > @@ -110,6 +110,7 @@ > #define APP_IDX_DEV_LOCAL 0x7fff > > #define DEFAULT_SEQUENCE_NUMBER 0x000000 > +#define SEQ_MASK 0xffffff > > #define IS_UNASSIGNED(x) ((x) == UNASSIGNED_ADDRESS) > #define IS_UNICAST(x) (((x) > UNASSIGNED_ADDRESS) && \ > diff --git a/mesh/net.h b/mesh/net.h > index 60396dbe7..bfc8064f3 100644 > --- a/mesh/net.h > +++ b/mesh/net.h > @@ -31,7 +31,6 @@ struct mesh_node; > #define APP_AID_DEV 0x00 > > #define CTL 0x80 > -#define SEQ_MASK 0xffffff > > #define CREDFLAG_MASK 0x1000 >
