Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Brian Gix <brian.gix@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, karl.westin@loytec.com,
        inga.stotland@intel.com
Subject: [PATCH BlueZ] mesh: Fix sequence number of message in friend queue
Date:   Wed, 19 Jan 2022 07:49:31 -0800
Message-Id: <20220119154931.182497-1-brian.gix@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

As pointed out by https://github.com/bluez/bluez/issues/250, the last
segment of a multi-segmented message added to Friend Queue was getting
reset to the seqAuth value incorrectly. The correct sequence was set
within the preceding for loop.
---
 mesh/net.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mesh/net.c b/mesh/net.c
index aa220f762..dd5398487 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -1325,7 +1325,6 @@ static bool friend_packet_queue(struct mesh_net *net,
 			hdr += (1 << SEGO_HDR_SHIFT);
 		}
 
-		frnd_msg->u.s12[seg_max].seq = seq;
 		frnd_msg->cnt_in = seg_max;
 		frnd_msg->last_len = size % 12;
 		if (!frnd_msg->last_len)
-- 
2.31.1