---

yaml --- r: 321599 b: refs/heads/master c: f57b07c h: refs/heads/master i: 321597: ce7bce3 321595: 7341353 321591: c1f89b5 321583: 39d3cca 321567: cdbc1ad 321535: 695fbec v: v3
git-mirror · Aug 12, 2012 · 96bd6f1 · 96bd6f1
1 parent 471dc94
commit 96bd6f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)