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

Commit 1ed1d4d7 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx 

[ 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: 82a9928d ("tc35815: Enable StripCRC feature")
Link: https://github.com/ClangBuiltLinux/linux/issues/608


Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2046ecf3

drivers/net/ethernet/toshiba/tc35815.c

+1 −1
Original line number Diff line number Diff line
@@ -1498,7 +1498,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);