Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db93645 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

net: qca_spi: Fix alignment issues in rx path 




[ Upstream commit 8d66c30b12ed3cb533696dea8b9a9eadd5da426a ]

The qca_spi driver causes alignment issues on ARM devices.
So fix this by using netdev_alloc_skb_ip_align().

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Fixes: 291ab06e ("net: qualcomm: new Ethernet over SPI driver for QCA7000")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c70c210b

drivers/net/ethernet/qualcomm/qca_spi.c

+6 −4
Original line number Diff line number Diff line
@@ -297,8 +297,9 @@ qcaspi_receive(struct qcaspi *qca) 


	/* Allocate rx SKB if we don't have one available. */

	if (!qca->rx_skb) {

		qca->rx_skb = netdev_alloc_skb(net_dev,

					       net_dev->mtu + VLAN_ETH_HLEN);

		qca->rx_skb = netdev_alloc_skb_ip_align(net_dev,

							net_dev->mtu +

							VLAN_ETH_HLEN);

		if (!qca->rx_skb) {

			netdev_dbg(net_dev, "out of RX resources\n");

			qca->stats.out_of_mem++;
@@ -378,7 +379,7 @@ qcaspi_receive(struct qcaspi *qca) 
					qca->rx_skb, qca->rx_skb->dev);

				qca->rx_skb->ip_summed = CHECKSUM_UNNECESSARY;

				netif_rx_ni(qca->rx_skb);

				qca->rx_skb = netdev_alloc_skb(net_dev,

				qca->rx_skb = netdev_alloc_skb_ip_align(net_dev,

					net_dev->mtu + VLAN_ETH_HLEN);

				if (!qca->rx_skb) {

					netdev_dbg(net_dev, "out of RX resources\n");
@@ -760,7 +761,8 @@ qcaspi_netdev_init(struct net_device *dev) 
	if (!qca->rx_buffer)

		return -ENOBUFS;



	qca->rx_skb = netdev_alloc_skb(dev, qca->net_dev->mtu + VLAN_ETH_HLEN);

	qca->rx_skb = netdev_alloc_skb_ip_align(dev, qca->net_dev->mtu +

						VLAN_ETH_HLEN);

	if (!qca->rx_skb) {

		kfree(qca->rx_buffer);

		netdev_info(qca->net_dev, "Failed to allocate RX sk_buff.\n");