diff options
| author | Joren Van Onder <joren.vanonder@gmail.com> | 2012-08-11 17:10:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-12 13:42:18 -0700 |
| commit | f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d (patch) | |
| tree | 1f9f7fb8d23c1f87021ffa3806c4f70723b89eff | |
| parent | 7f5c3e3a80e6654cf48dfba7cf94f88c6b505467 (diff) | |
| download | linux-stable-f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d.tar.gz linux-stable-f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d.tar.bz2 linux-stable-f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 77bcd4cb4ffb..463b9ec57d80 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) |