lkml.org 
[lkml]   [2019]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 17/57] net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx
    Date
    [ Upstream commit 125b7e0949d4e72b15c2b1a1590f8cece985a918 ]

    clang warns:

    drivers/net/ethernet/toshiba/tc35815.c:1507:30: warning: use of logical
    '&&' with constant operand [-Wconstant-logical-operand]
    if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
    ^ ~~~~~~~~~~~~
    drivers/net/ethernet/toshiba/tc35815.c:1507:30: note: use '&' for a
    bitwise operation
    if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
    ^~
    &
    drivers/net/ethernet/toshiba/tc35815.c:1507:30: note: remove constant to
    silence this warning
    if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
    ~^~~~~~~~~~~~~~~
    1 warning generated.

    Explicitly check that NET_IP_ALIGN is not zero, which matches how this
    is checked in other parts of the tree. Because NET_IP_ALIGN is a build
    time constant, this check will be constant folded away during
    optimization.

    Fixes: 82a9928db560 ("tc35815: Enable StripCRC feature")
    Link: https://github.com/ClangBuiltLinux/linux/issues/608
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/toshiba/tc35815.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
    index cce9c9ed46aa9..9146068979d2c 100644
    --- a/drivers/net/ethernet/toshiba/tc35815.c
    +++ b/drivers/net/ethernet/toshiba/tc35815.c
    @@ -1497,7 +1497,7 @@ tc35815_rx(struct net_device *dev, int limit)
    pci_unmap_single(lp->pci_dev,
    lp->rx_skbs[cur_bd].skb_dma,
    RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
    - if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
    + if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN != 0)
    memmove(skb->data, skb->data - NET_IP_ALIGN,
    pkt_len);
    data = skb_put(skb, pkt_len);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-08 14:48    [W:4.069 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site