Bluetooth: controller: Minor improvements to ext header population

Minor refactor and improvement to common extended header
population.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/hci/hci.c

@@ -5358,12 +5358,12 @@ static void le_per_adv_sync_report(struct pdu_data *pdu_data,
 		       p->ext_hdr_len);
 
 		if (!p->ext_hdr_len) {
-			hdr_len = ptr - (uint8_t *)p;
+			hdr_len = PDU_AC_EXT_HEADER_SIZE_MIN;
 
 			goto no_ext_hdr;
 		}
 
-		ptr += sizeof(*h);
+		ptr = h->data;
 
 		/* No AdvA */
 		/* No TargetA */

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c

@@ -214,6 +214,13 @@ static int prepare_cb(struct lll_prepare_param *p)
 	pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
 	pri_dptr = pri_hdr->data;
 
+	/* NOTE: We shall be here in auxiliary PDU prepare due to
+	 * aux_ptr flag being set in the extended common header
+	 * flags. Hence, ext_hdr_len is non-zero, an explicit check
+	 * is not needed.
+	 */
+	LL_ASSERT(pri_com_hdr->ext_hdr_len);
+
 	/* traverse through adv_addr, if present */
 	if (pri_hdr->adv_addr) {
 		pri_dptr += BDADDR_SIZE;

subsys/bluetooth/controller/ll_sw/ull_adv.c

@@ -393,11 +393,11 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
 
 		/* Zero-init header flags */
 		if (is_pdu_type_changed) {
-			*(uint8_t *)&pri_hdr_prev = 0;
+			*(uint8_t *)&pri_hdr_prev = 0U;
 		} else {
-			*(uint8_t *)&pri_hdr_prev = *(uint8_t *)pri_hdr;
+			pri_hdr_prev = *pri_hdr;
 		}
-		*(uint8_t *)pri_hdr = 0;
+		*(uint8_t *)pri_hdr = 0U;
 
 		/* AdvA flag */
 		if (pri_hdr_prev.adv_addr) {