diff options
author | Alexander Aring <alex.aring@gmail.com> | 2015-09-21 05:24:32 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-09-22 05:51:22 -0400 |
commit | ab40ff7508d2f54ed03b99523493c46250649c52 (patch) | |
tree | 40d431ec884c2ae3796ad95417b5502dd7c88631 /drivers/net/ieee802154 | |
parent | 42c7148e06661ae0ca1bb511e1b98878b5f522f8 (diff) |
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>
Diffstat (limited to 'drivers/net/ieee802154')
-rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 5 |
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) | |||
881 | goto out; | 881 | goto out; |
882 | } | 882 | } |
883 | 883 | ||
884 | /* Cut off the checksum */ | ||
885 | skb_trim(skb, len-2); | ||
886 | |||
887 | /* TODO: Other drivers call ieee20154_rx_irqsafe() here (eg: cc2040, | 884 | /* TODO: Other drivers call ieee20154_rx_irqsafe() here (eg: cc2040, |
888 | * also from a workqueue). I think irqsafe is not necessary here. | 885 | * also from a workqueue). I think irqsafe is not necessary here. |
889 | * Can someone confirm? */ | 886 | * Can someone confirm? */ |
@@ -1060,7 +1057,7 @@ static int mrf24j40_probe(struct spi_device *spi) | |||
1060 | devrec->hw = hw; | 1057 | devrec->hw = hw; |
1061 | devrec->hw->parent = &spi->dev; | 1058 | devrec->hw->parent = &spi->dev; |
1062 | devrec->hw->phy->supported.channels[0] = CHANNEL_MASK; | 1059 | devrec->hw->phy->supported.channels[0] = CHANNEL_MASK; |
1063 | devrec->hw->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AFILT; | 1060 | devrec->hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT; |
1064 | 1061 | ||
1065 | devrec->regmap_short = devm_regmap_init_spi(spi, | 1062 | devrec->regmap_short = devm_regmap_init_spi(spi, |
1066 | &mrf24j40_short_regmap); | 1063 | &mrf24j40_short_regmap); |