drivers: ieee802154: Implement get_lqi() relevantly

Change-Id: Idc433b77ea3cb38af648d70ad285429c29e53c08
Signed-off-by: Tomasz Bursztyka <[email protected]>

Author: Tomasz Bursztyka

drivers/ieee802154/ieee802154_cc2520.c

@@ -575,7 +575,6 @@ static void cc2520_rx(int arg, int unused2)
 	struct net_buf *pkt_buf = NULL;
 	struct net_buf *buf;
 	uint8_t pkt_len;
-	uint8_t lqi;
 
 	ARG_UNUSED(unused2);
 
@@ -643,18 +642,22 @@ static void cc2520_rx(int arg, int unused2)
 		 * else:
 		 * lqi = (lqi - 50) * 4
 		 */
-		lqi = pkt_buf->data[pkt_len - 1] & CC2520_FCS_CORRELATION;
-		if (lqi <= 50) {
-			lqi = 0;
-		} else if (lqi >= 110) {
-			lqi = 255;
+		cc2520->lqi = pkt_buf->data[pkt_len - 1] &
+			CC2520_FCS_CORRELATION;
+		if (cc2520->lqi <= 50) {
+			cc2520->lqi = 0;
+		} else if (cc2520->lqi >= 110) {
+			cc2520->lqi = 255;
 		} else {
-			lqi = (lqi - 50) << 2;
+			cc2520->lqi = (cc2520->lqi - 50) << 2;
 		}
 
-		net_buf_add_u8(pkt_buf, lqi);
+#if defined(CONFIG_TI_CC2520_RAW)
+		net_buf_add_u8(pkt_buf, cc2520->lqi);
+#endif
 
-		SYS_LOG_DBG("Caught a packet (%u) (LQI: %u)\n", pkt_len, lqi);
+		SYS_LOG_DBG("Caught a packet (%u) (LQI: %u)\n",
+			    pkt_len, cc2520->lqi);
 
 		if (net_recv_data(cc2520->iface, buf) < 0) {
 			SYS_LOG_DBG("Packet dropped by NET stack\n");
@@ -897,6 +900,12 @@ static int cc2520_stop(struct device *dev)
 	return 0;
 }
 
+static uint8_t cc2520_get_lqi(struct device *dev)
+{
+	struct cc2520_context *cc2520 = dev->driver_data;
+
+	return cc2520->lqi;
+}
 
 /******************
  * Initialization *
@@ -1053,6 +1062,7 @@ static struct ieee802154_radio_api cc2520_radio_api = {
 	.start		= cc2520_start,
 	.stop		= cc2520_stop,
 	.tx		= cc2520_tx,
+	.get_lqi	= cc2520_get_lqi,
 };
 
 #if defined(CONFIG_TI_CC2520_RAW)

drivers/ieee802154/ieee802154_cc2520.h

@@ -55,6 +55,7 @@ struct cc2520_context {
 	char __stack cc2520_rx_stack[CONFIG_CC2520_RX_STACK_SIZE];
 	struct nano_sem rx_lock;
 	bool overflow;
+	uint8_t lqi;
 };
 
 extern struct device **cc2520_configure_gpios(void);

drivers/ieee802154/ieee802154_uart_pipe.c

@@ -79,8 +79,7 @@ static uint8_t *upipe_rx(uint8_t *buf, size_t *off)
 		net_buf_frag_insert(nbuf, pkt_buf);
 
 		memcpy(pkt_buf->data, upipe->rx_buf, upipe->rx_len);
-		/* packet length plus missing LQI (one byte) */
-		net_buf_add(pkt_buf, upipe->rx_len + 1);
+		net_buf_add(pkt_buf, upipe->rx_len);
 
 		if (ieee802154_radio_handle_ack(upipe->iface, nbuf) == NET_OK) {
 			SYS_LOG_DBG("ACK packet handled");

net/yaip/l2/ieee802154/ieee802154.c

@@ -92,17 +92,6 @@ static void pkt_hexdump(struct net_buf *buf, bool each_frag_reserve)
 #define pkt_hexdump(...)
 #endif
 
-static inline uint8_t get_lqi(struct net_buf *buf)
-{
-	uint8_t *lqi;
-
-	buf->len -= 1;
-
-	lqi = net_buf_tail(buf);
-
-	return *lqi;
-}
-
 #ifdef CONFIG_NET_L2_IEEE802154_ACK_REPLY
 static inline void ieee802154_acknowledge(struct net_if *iface,
 					  struct ieee802154_mpdu *mpdu)
@@ -258,9 +247,6 @@ static enum net_verdict ieee802154_recv(struct net_if *iface,
 {
 	struct ieee802154_mpdu mpdu;
 
-	/* Let's remove LQI for now as it is not used */
-	get_lqi(buf->frags);
-
 	if (!ieee802154_validate_frame(net_nbuf_ll(buf),
 				       net_buf_frags_len(buf), &mpdu)) {
 		return NET_DROP;
@@ -316,6 +302,12 @@ static enum net_verdict ieee802154_send(struct net_if *iface,
 
 	frag = buf->frags;
 	while (frag) {
+		if (frag->len > IEEE802154_MTU) {
+			NET_ERR("Frag %p as too big length %u",
+				frag, frag->len);
+			return NET_DROP;
+		}
+
 		if (!ieee802154_create_data_frame(iface, buf,
 						  frag->data - reserved_space,
 						  reserved_space)) {