net: gptp: Refactor the gPTP header addition

Increase the net_buf length in proper places. So when gPTP
header is added, increase the buf->len properly, and then
when gPTP packet type is added, increase it again properly.
This way the net_buf length is updated in more logical way.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

subsys/net/l2/ethernet/gptp/gptp_messages.c

@@ -169,6 +169,8 @@ static struct net_pkt *setup_gptp_frame(struct net_if *iface)
 	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)&gptp_multicast_eth_addr;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
+	net_buf_add(frag, sizeof(struct gptp_hdr));
+
 	return pkt;
 }
 
@@ -220,8 +222,7 @@ struct net_pkt *gptp_prepare_sync(int port)
 	/* PTP configuration. */
 	(void)memset(&sync->reserved, 0, sizeof(sync->reserved));
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_sync));
+	net_buf_add(pkt->frags, sizeof(struct gptp_sync));
 
 	/* Update sequence number. */
 	port_ds->sync_seq_id++;
@@ -277,8 +278,7 @@ struct net_pkt *gptp_prepare_follow_up(int port, struct net_pkt *sync)
 
 	/* PTP configuration will be set by the MDSyncSend state machine. */
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_follow_up));
+	net_buf_add(pkt->frags, sizeof(struct gptp_follow_up));
 
 	return pkt;
 }
@@ -334,8 +334,7 @@ struct net_pkt *gptp_prepare_pdelay_req(int port)
 	(void)memset(&req->reserved1, 0, sizeof(req->reserved1));
 	(void)memset(&req->reserved2, 0, sizeof(req->reserved2));
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_pdelay_req));
+	net_buf_add(pkt->frags, sizeof(struct gptp_pdelay_req));
 
 	/* Update sequence number. */
 	port_ds->pdelay_req_seq_id++;
@@ -400,8 +399,7 @@ struct net_pkt *gptp_prepare_pdelay_resp(int port,
 	memcpy(&pdelay_resp->requesting_port_id,
 	       &query->port_id, sizeof(struct gptp_port_identity));
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_pdelay_resp));
+	net_buf_add(pkt->frags, sizeof(struct gptp_pdelay_resp));
 
 	return pkt;
 }
@@ -464,8 +462,7 @@ struct net_pkt *gptp_prepare_pdelay_follow_up(int port,
 	       &pdelay_resp->requesting_port_id,
 	       sizeof(struct gptp_port_identity));
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_pdelay_resp_follow_up));
+	net_buf_add(pkt->frags, sizeof(struct gptp_pdelay_resp_follow_up));
 
 	return pkt;
 }
@@ -563,8 +560,7 @@ struct net_pkt *gptp_prepare_announce(int port)
 				    sizeof(struct gptp_announce) - 8 +
 				    ntohs(global_ds->path_trace.len));
 
-	net_buf_add(pkt->frags, sizeof(struct gptp_hdr) +
-		    sizeof(struct gptp_announce) - 8);
+	net_buf_add(pkt->frags, sizeof(struct gptp_announce) - 8);
 
 	ann->tlv.len = global_ds->path_trace.len;