[PATCH 3.16 105/328] mac802154: tx: cleanup crc calculation

Ben Hutchings
2018-12-09T22:05:39Z

From: Alexander Aring <alex.aring@gmail.com>

commit b7eec52bcb7ab93a8cce0f718f42fa17d6d91745 upstream.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -95,10 +95,9 @@ netdev_tx_t mac802154_tx(struct mac80215
mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb);

if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
- u16 crc = crc_ccitt(0, skb->data, skb->len);
- u8 *data = skb_put(skb, 2);
- data[0] = crc & 0xff;
- data[1] = crc >> 8;
+ __le16 crc = cpu_to_le16(crc_ccitt(0, skb->data, skb->len));
+
+ memcpy(skb_put(skb, 2), &crc, 2);
}

if (skb_cow_head(skb, priv->hw.extra_tx_headroom))