net: pkt: remove redundant net_pkt_cb_ieee802154 fields

Remove redundant `arb` and `fv2015` fields. Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>
zephyrproject-rtos · Nov 2, 2023 · 719f70a · 719f70a
1 parent 9cf07bb
commit 719f70a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/include/zephyr/net/ieee802154_pkt.h b/include/zephyr/net/ieee802154_pkt.h
@@ -68,7 +68,6 @@ struct net_pkt_cb_ieee802154 {
 	};
 
 	/* Flags */
-	uint8_t arb : 1;	   /* ACK Request Bit is set in the frame */
 	uint8_t ack_fpb : 1;	   /* Frame Pending Bit was set in the ACK */
 	uint8_t frame_secured : 1; /* Frame is authenticated and
 				    * encrypted according to its
@@ -80,9 +79,6 @@ struct net_pkt_cb_ieee802154 {
 				    * e.g. Frame Counter injection.
 				    */
 #if defined(CONFIG_NET_L2_OPENTHREAD)
-	uint8_t fv2015: 1;   /* Frame version is IEEE 802.15.4 (0b10),
-			      * see section 7.2.2.10, table 7-3.
-			      */
 	uint8_t ack_seb : 1; /* Security Enabled Bit was set in the ACK */
 #endif
 };
@@ -201,16 +197,6 @@ static inline void net_pkt_set_ieee802154_txpwr(struct net_pkt *pkt, int8_t txpw
 }
 #endif /* CONFIG_IEEE802154_SELECTIVE_TXPOWER */
 
-static inline bool net_pkt_ieee802154_arb(struct net_pkt *pkt)
-{
-	return net_pkt_cb_ieee802154(pkt)->arb;
-}
-
-static inline void net_pkt_set_ieee802154_arb(struct net_pkt *pkt, bool arb)
-{
-	net_pkt_cb_ieee802154(pkt)->arb = arb;
-}
-
 static inline bool net_pkt_ieee802154_ack_fpb(struct net_pkt *pkt)
 {
 	return net_pkt_cb_ieee802154(pkt)->ack_fpb;
@@ -262,16 +248,6 @@ static inline void net_pkt_set_ieee802154_ack_keyid(struct net_pkt *pkt, uint8_t
 	net_pkt_cb_ieee802154(pkt)->ack_keyid = keyid;
 }
 
-static inline bool net_pkt_ieee802154_fv2015(struct net_pkt *pkt)
-{
-	return net_pkt_cb_ieee802154(pkt)->fv2015;
-}
-
-static inline void net_pkt_set_ieee802154_fv2015(struct net_pkt *pkt, bool fv2015)
-{
-	net_pkt_cb_ieee802154(pkt)->fv2015 = fv2015;
-}
-
 static inline bool net_pkt_ieee802154_ack_seb(struct net_pkt *pkt)
 {
 	return net_pkt_cb_ieee802154(pkt)->ack_seb;

diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c
@@ -478,14 +478,9 @@ static void openthread_handle_received_frame(otInstance *instance,
 	recv_frame.mInfo.mRxInfo.mTimestamp = net_pkt_timestamp_ns(pkt) / NSEC_PER_USEC;
 #endif
 
-	if (net_pkt_ieee802154_arb(pkt) && net_pkt_ieee802154_fv2015(pkt)) {
-		recv_frame.mInfo.mRxInfo.mAckedWithSecEnhAck =
-			net_pkt_ieee802154_ack_seb(pkt);
-		recv_frame.mInfo.mRxInfo.mAckFrameCounter =
-			net_pkt_ieee802154_ack_fc(pkt);
-		recv_frame.mInfo.mRxInfo.mAckKeyId =
-			net_pkt_ieee802154_ack_keyid(pkt);
-	}
+	recv_frame.mInfo.mRxInfo.mAckedWithSecEnhAck = net_pkt_ieee802154_ack_seb(pkt);
+	recv_frame.mInfo.mRxInfo.mAckFrameCounter = net_pkt_ieee802154_ack_fc(pkt);
+	recv_frame.mInfo.mRxInfo.mAckKeyId = net_pkt_ieee802154_ack_keyid(pkt);
 
 	if (IS_ENABLED(CONFIG_OPENTHREAD_DIAG) && otPlatDiagModeGet()) {
 		otPlatDiagRadioReceiveDone(instance, &recv_frame, OT_ERROR_NONE);

diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -604,7 +604,6 @@ static bool test_packet_cloning_with_cb(void)
 
 	zassert_true(net_pkt_ieee802154_ack_fpb(cloned_pkt));
 	zassert_true(net_pkt_ieee802154_frame_secured(cloned_pkt));
-	zassert_false(net_pkt_ieee802154_arb(cloned_pkt));
 	zassert_false(net_pkt_ieee802154_mac_hdr_rdy(cloned_pkt));
 	zassert_equal(net_pkt_ieee802154_lqi(cloned_pkt), 50U);
 	zassert_equal(net_pkt_ieee802154_rssi(cloned_pkt), 0U);