diff options
-rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 2 | ||||
-rw-r--r-- | drivers/net/ieee802154/atusb.c | 2 | ||||
-rw-r--r-- | drivers/net/ieee802154/cc2520.c | 3 | ||||
-rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 3 | ||||
-rw-r--r-- | include/net/mac802154.h | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 6e20e9c94b3c..1bf86d2df23f 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c | |||
@@ -1443,7 +1443,7 @@ at86rf230_detect_device(struct at86rf230_local *lp) | |||
1443 | return -EINVAL; | 1443 | return -EINVAL; |
1444 | } | 1444 | } |
1445 | 1445 | ||
1446 | lp->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AACK | | 1446 | lp->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | |
1447 | IEEE802154_HW_CSMA_PARAMS | | 1447 | IEEE802154_HW_CSMA_PARAMS | |
1448 | IEEE802154_HW_FRAME_RETRIES | IEEE802154_HW_AFILT | | 1448 | IEEE802154_HW_FRAME_RETRIES | IEEE802154_HW_AFILT | |
1449 | IEEE802154_HW_PROMISCUOUS; | 1449 | IEEE802154_HW_PROMISCUOUS; |
diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c index 3d25678dfd95..80dfc725b8dc 100644 --- a/drivers/net/ieee802154/atusb.c +++ b/drivers/net/ieee802154/atusb.c | |||
@@ -628,7 +628,7 @@ static int atusb_probe(struct usb_interface *interface, | |||
628 | 628 | ||
629 | hw->parent = &usb_dev->dev; | 629 | hw->parent = &usb_dev->dev; |
630 | hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT | | 630 | hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT | |
631 | IEEE802154_HW_AACK | IEEE802154_HW_PROMISCUOUS; | 631 | IEEE802154_HW_PROMISCUOUS; |
632 | 632 | ||
633 | hw->phy->flags = WPAN_PHY_FLAG_TXPOWER; | 633 | hw->phy->flags = WPAN_PHY_FLAG_TXPOWER; |
634 | 634 | ||
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c index a8bafd6bd5e4..15f263cfece5 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c | |||
@@ -746,8 +746,7 @@ static int cc2520_register(struct cc2520_private *priv) | |||
746 | 746 | ||
747 | /* We do support only 2.4 Ghz */ | 747 | /* We do support only 2.4 Ghz */ |
748 | priv->hw->phy->supported.channels[0] = 0x7FFF800; | 748 | priv->hw->phy->supported.channels[0] = 0x7FFF800; |
749 | priv->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK | | 749 | priv->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT; |
750 | IEEE802154_HW_AFILT; | ||
751 | 750 | ||
752 | priv->hw->phy->flags = WPAN_PHY_FLAG_TXPOWER; | 751 | priv->hw->phy->flags = WPAN_PHY_FLAG_TXPOWER; |
753 | 752 | ||
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index f2a1bd122a74..99c767695c7b 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c | |||
@@ -751,8 +751,7 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
751 | devrec->hw->priv = devrec; | 751 | devrec->hw->priv = devrec; |
752 | devrec->hw->parent = &devrec->spi->dev; | 752 | devrec->hw->parent = &devrec->spi->dev; |
753 | devrec->hw->phy->supported.channels[0] = CHANNEL_MASK; | 753 | devrec->hw->phy->supported.channels[0] = CHANNEL_MASK; |
754 | devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK | | 754 | devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT; |
755 | IEEE802154_HW_AFILT; | ||
756 | 755 | ||
757 | dev_dbg(printdev(devrec), "registered mrf24j40\n"); | 756 | dev_dbg(printdev(devrec), "registered mrf24j40\n"); |
758 | ret = ieee802154_register_hw(devrec->hw); | 757 | ret = ieee802154_register_hw(devrec->hw); |
diff --git a/include/net/mac802154.h b/include/net/mac802154.h index 845e4f88a33e..a20ba28ad9c5 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h | |||
@@ -90,8 +90,6 @@ struct ieee802154_hw { | |||
90 | 90 | ||
91 | /* Indicates that xmitter will add FCS on it's own. */ | 91 | /* Indicates that xmitter will add FCS on it's own. */ |
92 | #define IEEE802154_HW_TX_OMIT_CKSUM 0x00000001 | 92 | #define IEEE802154_HW_TX_OMIT_CKSUM 0x00000001 |
93 | /* Indicates that receiver will autorespond with ACK frames. */ | ||
94 | #define IEEE802154_HW_AACK 0x00000002 | ||
95 | /* Indicates that transceiver will support listen before transmit. */ | 93 | /* Indicates that transceiver will support listen before transmit. */ |
96 | #define IEEE802154_HW_LBT 0x00000004 | 94 | #define IEEE802154_HW_LBT 0x00000004 |
97 | /* Indicates that transceiver will support csma (max_be, min_be, csma retries) | 95 | /* Indicates that transceiver will support csma (max_be, min_be, csma retries) |