Commit f57b07c0 authored Aug 11, 2012 by Joren Van Onder Committed by David S. Miller Aug 12, 2012

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 <joren.vanonder@gmail.com>
Acked-By: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7f5c3e3a

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1278,7 +1278,7 @@ struct bnx2x {
	#define BNX2X_FW_RX_ALIGN_START (1UL << BNX2X_RX_ALIGN_SHIFT)		#define BNX2X_FW_RX_ALIGN_START (1UL << BNX2X_RX_ALIGN_SHIFT)

	#define BNX2X_FW_RX_ALIGN_END \		#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)))		SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))

	#define BNX2X_PXP_DRAM_ALIGN (BNX2X_RX_ALIGN_SHIFT - 5)		#define BNX2X_PXP_DRAM_ALIGN (BNX2X_RX_ALIGN_SHIFT - 5)