lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 022/190] net: qca_spi: Fix alignment issues in rx path
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Wahren <stefan.wahren@i2se.com>


    [ 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: Stefan Wahren <stefan.wahren@i2se.com>
    Fixes: 291ab06ecf67 ("net: qualcomm: new Ethernet over SPI driver for QCA7000")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/qualcomm/qca_spi.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/qualcomm/qca_spi.c
    +++ b/drivers/net/ethernet/qualcomm/qca_spi.c
    @@ -296,8 +296,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++;
    @@ -377,7 +378,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");
    @@ -759,7 +760,8 @@ qcaspi_netdev_init(struct net_device *de
    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");

    \
     
     \ /
      Last update: 2018-04-11 22:48    [W:4.127 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site