* [PATCH] net: ti: cpmac: Fix compiler warning due to type confusion
@ 2016-09-02 14:22 Paul Burton
2016-09-04 18:48 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Paul Burton @ 2016-09-02 14:22 UTC (permalink / raw
To: Florian Fainelli, netdev; +Cc: Paul Burton, linux-kernel
cpmac_start_xmit() used the max() macro on skb->len (an unsigned int)
and ETH_ZLEN (a signed int literal). This led to the following compiler
warning:
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from drivers/net/ethernet/ti/cpmac.c:19:
drivers/net/ethernet/ti/cpmac.c: In function 'cpmac_start_xmit':
include/linux/kernel.h:748:17: warning: comparison of distinct pointer
types lacks a cast
(void) (&_max1 == &_max2); \
^
drivers/net/ethernet/ti/cpmac.c:560:8: note: in expansion of macro 'max'
len = max(skb->len, ETH_ZLEN);
^
On top of this, it assigned the result of the max() macro to a signed
integer whilst all further uses of it result in it being cast to varying
widths of unsigned integer.
Fix this up by using max_t to ensure the comparison is performed as
unsigned integers, and for consistency change the type of the len
variable to unsigned int.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
---
drivers/net/ethernet/ti/cpmac.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 7eef45e..b1454bd 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -547,7 +547,8 @@ fatal_error:
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
- int queue, len;
+ int queue;
+ unsigned int len;
struct cpmac_desc *desc;
struct cpmac_priv *priv = netdev_priv(dev);
@@ -557,7 +558,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(skb_padto(skb, ETH_ZLEN)))
return NETDEV_TX_OK;
- len = max(skb->len, ETH_ZLEN);
+ len = max_t(unsigned int, skb->len, ETH_ZLEN);
queue = skb_get_queue_mapping(skb);
netif_stop_subqueue(dev, queue);
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: ti: cpmac: Fix compiler warning due to type confusion
2016-09-02 14:22 [PATCH] net: ti: cpmac: Fix compiler warning due to type confusion Paul Burton
@ 2016-09-04 18:48 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-09-04 18:48 UTC (permalink / raw
To: paul.burton; +Cc: florian, netdev, linux-kernel
From: Paul Burton <paul.burton@imgtec.com>
Date: Fri, 2 Sep 2016 15:22:48 +0100
> cpmac_start_xmit() used the max() macro on skb->len (an unsigned int)
> and ETH_ZLEN (a signed int literal). This led to the following compiler
> warning:
>
> In file included from include/linux/list.h:8:0,
> from include/linux/module.h:9,
> from drivers/net/ethernet/ti/cpmac.c:19:
> drivers/net/ethernet/ti/cpmac.c: In function 'cpmac_start_xmit':
> include/linux/kernel.h:748:17: warning: comparison of distinct pointer
> types lacks a cast
> (void) (&_max1 == &_max2); \
> ^
> drivers/net/ethernet/ti/cpmac.c:560:8: note: in expansion of macro 'max'
> len = max(skb->len, ETH_ZLEN);
> ^
>
> On top of this, it assigned the result of the max() macro to a signed
> integer whilst all further uses of it result in it being cast to varying
> widths of unsigned integer.
>
> Fix this up by using max_t to ensure the comparison is performed as
> unsigned integers, and for consistency change the type of the len
> variable to unsigned int.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-04 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-02 14:22 [PATCH] net: ti: cpmac: Fix compiler warning due to type confusion Paul Burton
2016-09-04 18:48 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.