summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-09-21 11:24:32 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-09-22 11:51:22 +0200
commitab40ff7508d2f54ed03b99523493c46250649c52 (patch)
tree40d431ec884c2ae3796ad95417b5502dd7c88631
parentmrf24j40: use regmap for register access (diff)
downloadlinux-ab40ff7508d2f54ed03b99523493c46250649c52.tar.xz
linux-ab40ff7508d2f54ed03b99523493c46250649c52.zip
mrf24j40: change to frame delivery with crc
This patch changes the frame delivery to mac802154 with crc. This is useful for monitor interface types which deliver the crc to userspace. Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com> Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/mrf24j40.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index ca98b5c603ce..788adb654f32 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -881,9 +881,6 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec)
goto out;
}
- /* Cut off the checksum */
- skb_trim(skb, len-2);
-
/* TODO: Other drivers call ieee20154_rx_irqsafe() here (eg: cc2040,
* also from a workqueue). I think irqsafe is not necessary here.
* Can someone confirm? */
@@ -1060,7 +1057,7 @@ static int mrf24j40_probe(struct spi_device *spi)
devrec->hw = hw;
devrec->hw->parent = &spi->dev;
devrec->hw->phy->supported.channels[0] = CHANNEL_MASK;
- devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT;
+ devrec->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT;
devrec->regmap_short = devm_regmap_init_spi(spi,
&mrf24j40_short_regmap);