From 96bd6f1bfb3f4177a05e05959bc4da72095bd1cd Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Sat, 11 Aug 2012 17:10:35 +0000 Subject: [PATCH] --- yaml --- r: 321599 b: refs/heads/master c: f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d h: refs/heads/master i: 321597: ce7bce3b17c9d47744a48d40dc7f78b2539df291 321595: 734135311f72f0297b0462adb52d5603aa8d22b4 321591: c1f89b505be088ac70ca6441bc29b64bcd2974a1 321583: 39d3cca9e4c27502aa01f3989ceac8ad8f3990a1 321567: cdbc1ad42f4b7c266b9c99e704cc9b7e9a4d3816 321535: 695fbece37b82e09342dc3d0411b86d5532742a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b798f584214d..cf48d55f0480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f5c3e3a80e6654cf48dfba7cf94f88c6b505467 +refs/heads/master: f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 77bcd4cb4ffb..463b9ec57d80 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/trunk/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)