mac802154: remove aack hw flag

This patch removes the hardware auto acknowdledge flag which indicates
that the transceiver supports this handling. This flag is never
evaluated inside mac802154 and all transceivers should support this
handling by default per hardware.

Suggested-by: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Alan Ott <alan@signal11.us>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Reviewed-by: Varka Bhadram <varkabhadram@gmail.com>
Acked-by: Stefan Schmidt <stefan@osg.samsung.com>
Acked-by: Varka Bhadram <varkabhadram@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 6e20e9c94b3c956b4628817e08b0834f5e720500..1bf86d2df23fd9b84219a46cb9395b30a78c2a5a 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1443,7 +1443,7 @@ at86rf230_detect_device(struct at86rf230_local *lp)
                return -EINVAL;
        }
 
-       lp->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AACK |
+       lp->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM |
                        IEEE802154_HW_CSMA_PARAMS |
                        IEEE802154_HW_FRAME_RETRIES | IEEE802154_HW_AFILT |
                        IEEE802154_HW_PROMISCUOUS;

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 3d25678dfd951fbe9e93f9cf92f140bd6c0316e8..80dfc725b8dc4d7efca4dbc23e891e13b423a839 100644 (file)
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -628,7 +628,7 @@ static int atusb_probe(struct usb_interface *interface,
 
        hw->parent = &usb_dev->dev;
        hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT |
-                   IEEE802154_HW_AACK | IEEE802154_HW_PROMISCUOUS;
+                   IEEE802154_HW_PROMISCUOUS;
 
        hw->phy->flags = WPAN_PHY_FLAG_TXPOWER;
 

diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index a8bafd6bd5e420e478ca78c113f3f06f54804b8e..15f263cfece514b2d53eee8ac010f1dac75644b8 100644 (file)
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -746,8 +746,7 @@ static int cc2520_register(struct cc2520_private *priv)
 
        /* We do support only 2.4 Ghz */
        priv->hw->phy->supported.channels[0] = 0x7FFF800;
-       priv->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK |
-                         IEEE802154_HW_AFILT;
+       priv->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT;
 
        priv->hw->phy->flags = WPAN_PHY_FLAG_TXPOWER;
 

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index f2a1bd122a74b4032e7feb997a36652c9683905c..99c767695c7be71907f517894d9edb91613f1800 100644 (file)
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -751,8 +751,7 @@ static int mrf24j40_probe(struct spi_device *spi)
        devrec->hw->priv = devrec;
        devrec->hw->parent = &devrec->spi->dev;
        devrec->hw->phy->supported.channels[0] = CHANNEL_MASK;
-       devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK |
-                           IEEE802154_HW_AFILT;
+       devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT;
 
        dev_dbg(printdev(devrec), "registered mrf24j40\n");
        ret = ieee802154_register_hw(devrec->hw);

diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 845e4f88a33e48af99c22fba0066f7498bb60d8a..a20ba28ad9c58df1d7c26d97dc9323d70b76486d 100644 (file)
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -90,8 +90,6 @@ struct ieee802154_hw {
 
 /* Indicates that xmitter will add FCS on it's own. */
 #define IEEE802154_HW_TX_OMIT_CKSUM    0x00000001
-/* Indicates that receiver will autorespond with ACK frames. */
-#define IEEE802154_HW_AACK             0x00000002
 /* Indicates that transceiver will support listen before transmit. */
 #define IEEE802154_HW_LBT              0x00000004
 /* Indicates that transceiver will support csma (max_be, min_be, csma retries)