2012-08-12 03:24:13

by Joren Van Onder

Subject: [PATCH] bnx2x: Fix compiler warnings

Fix the following compiler warnings:

- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c:2908:3: warning: comparison
of distinct pointer types lacks a cast [enabled by default]
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:1709:7: warning: comparison
of distinct pointer types lacks a cast [enabled by default]

Signed-off-by: Joren Van Onder <[email protected]>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 77bcd4c..463b9ec 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1278,7 +1278,7 @@ struct bnx2x {
#define BNX2X_FW_RX_ALIGN_START (1UL << BNX2X_RX_ALIGN_SHIFT)

#define BNX2X_FW_RX_ALIGN_END \
- max(1UL << BNX2X_RX_ALIGN_SHIFT, \
+ max_t(u64, 1UL << BNX2X_RX_ALIGN_SHIFT, \
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))

#define BNX2X_PXP_DRAM_ALIGN (BNX2X_RX_ALIGN_SHIFT - 5)
--
1.7.9.5

2012-08-12 04:50:07

by Yuval Mintz

Subject: Re: [PATCH] bnx2x: Fix compiler warnings

> Fix the following compiler warnings:
>
> - drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c:2908:3: warning: comparison
> of distinct pointer types lacks a cast [enabled by default]
> - drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:1709:7: warning: comparison
> of distinct pointer types lacks a cast [enabled by default]
>
> Signed-off-by: Joren Van Onder <[email protected]>
Thanks Joren.
Acked-By: Yuval Mintz <[email protected]>

2012-08-12 20:42:27

by David Miller

Subject: Re: [PATCH] bnx2x: Fix compiler warnings

From: "Yuval Mintz" <[email protected]>
Date: Sun, 12 Aug 2012 07:50:48 +0300

>> Fix the following compiler warnings:
>>
>> - drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c:2908:3: warning: comparison
>> of distinct pointer types lacks a cast [enabled by default]
>> - drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:1709:7: warning: comparison
>> of distinct pointer types lacks a cast [enabled by default]
>>
>> Signed-off-by: Joren Van Onder <[email protected]>
> Thanks Joren.
> Acked-By: Yuval Mintz <[email protected]>

Applied.