summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-29 23:34:30 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-10-30 01:07:44 +0300
commitab79be3eebf28be5315e43d0002ebcc05858af0b (patch)
treedc28246ff0b03c5013768705632522b20092f5b4
parent90a6161df57e7943cdd575ce95c1c62b468407e3 (diff)
downloadlinux-ab79be3eebf28be5315e43d0002ebcc05858af0b.tar.xz
mac802154: add IEEE802154_HW_ARET hw flag
This patch adds a new IEEE802154_HW_ARET hardware flag for indicating that the transceiver supports ARET handling. Also remove the IEEE802154_HW_FRAME_RETRIES from IEEE802154_HW_CSMA flag. Frame retries handling is part of ARET. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/at86rf230.c2
-rw-r--r--include/net/mac802154.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index b83ad0b38688..005458821c5d 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1387,7 +1387,7 @@ at86rf230_detect_device(struct at86rf230_local *lp)
lp->hw->extra_tx_headroom = 0;
lp->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK |
- IEEE802154_HW_TXPOWER | IEEE802154_HW_CSMA;
+ IEEE802154_HW_TXPOWER | IEEE802154_HW_ARET;
switch (part) {
case 2:
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index fe1495796ce7..c5d79384847a 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -94,7 +94,10 @@ struct ieee802154_hw {
/* This groups the most common CSMA support fields into one. */
#define IEEE802154_HW_CSMA (IEEE802154_HW_CCA_MODE | \
IEEE802154_HW_CCA_ED_LEVEL | \
- IEEE802154_HW_CSMA_PARAMS | \
+ IEEE802154_HW_CSMA_PARAMS)
+
+/* This groups the most common ARET support fields into one. */
+#define IEEE802154_HW_ARET (IEEE802154_HW_CSMA | \
IEEE802154_HW_FRAME_RETRIES)
/* struct ieee802154_ops - callbacks from mac802154 to the driver