Patchwork mrf24j40: Enable link-layer acknowledgement and retry

login
register
mail settings
Submitter Alan Ott
Date April 5, 2013, 8:34 p.m.
Message ID <1365194091-2542-1-git-send-email-alan@signal11.us>
Download mbox | patch
Permalink /patch/234274/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alan Ott - April 5, 2013, 8:34 p.m.
On the MRF24J40, link-layer acknowledgment request and retry must be
turned on explicitly for each packet.  Turn this on in the hardware based
on the FC_ACK_REQ bit being set in the packet.

Also, now that failure to receive an ACK will cause the hardware to report
failure of transmission, change the log level for this failure to debug
level.

Signed-off-by: Alan Ott <alan@signal11.us>
---
 drivers/net/ieee802154/mrf24j40.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
David Miller - April 8, 2013, 4:09 p.m.
From: Alan Ott <alan@signal11.us>
Date: Fri,  5 Apr 2013 16:34:51 -0400

> On the MRF24J40, link-layer acknowledgment request and retry must be
> turned on explicitly for each packet.  Turn this on in the hardware based
> on the FC_ACK_REQ bit being set in the packet.
> 
> Also, now that failure to receive an ACK will cause the hardware to report
> failure of transmission, change the log level for this failure to debug
> level.
> 
> Signed-off-by: Alan Ott <alan@signal11.us>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 6481faf..556151d 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -25,6 +25,7 @@ 
 #include <linux/pinctrl/consumer.h>
 #include <net/wpan-phy.h>
 #include <net/mac802154.h>
+#include <net/ieee802154.h>
 
 /* MRF24J40 Short Address Registers */
 #define REG_RXMCR    0x00  /* Receive MAC control */
@@ -349,7 +350,9 @@  static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
 	if (ret)
 		goto err;
 	val |= 0x1;
-	val &= ~0x4;
+	/* Set TXNACKREQ if the ACK bit is set in the packet. */
+	if (skb->data[0] & IEEE802154_FC_ACK_REQ)
+		val |= 0x4;
 	write_short_reg(devrec, REG_TXNCON, val);
 
 	INIT_COMPLETION(devrec->tx_complete);
@@ -371,7 +374,7 @@  static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
 	if (ret)
 		goto err;
 	if (val & 0x1) {
-		dev_err(printdev(devrec), "Error Sending. Retry count exceeded\n");
+		dev_dbg(printdev(devrec), "Error Sending. Retry count exceeded\n");
 		ret = -ECOMM; /* TODO: Better error code ? */
 	} else
 		dev_dbg(printdev(devrec), "Packet Sent\n");