From: "Gix, Brian" <brian.gix@intel.com>
To: "linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>,
"Stotland, Inga" <inga.stotland@intel.com>
Subject: Re: [PATCH BlueZ 1/2] mesh: Move SEQ_MASK define in mesh-defs.h
Date: Thu, 2 Apr 2020 01:33:01 +0000 [thread overview]
Message-ID: <2c8a8ff08d3fcf31328be9c28b1ba2b6d1ef9be3.camel@intel.com> (raw)
In-Reply-To: <20200402000436.23209-1-inga.stotland@intel.com>
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
>
prev parent reply other threads:[~2020-04-02 1:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 0:04 [PATCH BlueZ 1/2] mesh: Move SEQ_MASK define in mesh-defs.h Inga Stotland
2020-04-02 0:04 ` [PATCH BlueZ 2/2] mesh: Fix segfault related to idle config write Inga Stotland
2020-04-02 1:33 ` Gix, Brian [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c8a8ff08d3fcf31328be9c28b1ba2b6d1ef9be3.camel@intel.com \
--to=brian.gix@intel.com \
--cc=inga.stotland@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).