From 80337d13d144605401ed35600dc79f2f5e981f58 Mon Sep 17 00:00:00 2001
From: vignesh babu <vignesh.babu@wipro.com>
Date: Mon, 9 Jul 2007 11:50:22 -0700
Subject: [PATCH] --- yaml --- r: 58731 b: refs/heads/master c:
 199126a23a091585670fba023529b73047bb2bad h: refs/heads/master i:   58729:
 8d0f97cf31d5393cf8e97b23d59cb84717a8f66b   58727:
 84d44b0380d74637625766333a41749f11b65b32 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/myri10ge/myri10ge.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38f7bec41de8..f05cc4909c0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9da466a3ce2ac005e05bb649a0f2cfb5c3d5d45
+refs/heads/master: 199126a23a091585670fba023529b73047bb2bad
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index d0cc122fa3f0..e1732c164a40 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -60,6 +60,7 @@
 #include <linux/crc32.h>
 #include <linux/moduleparam.h>
 #include <linux/io.h>
+#include <linux/log2.h>
 #include <net/checksum.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -1804,7 +1805,7 @@ static int myri10ge_open(struct net_device *dev)
 	 */
 	big_pow2 = dev->mtu + ETH_HLEN + VLAN_HLEN + MXGEFW_PAD;
 	if (big_pow2 < MYRI10GE_ALLOC_SIZE / 2) {
-		while ((big_pow2 & (big_pow2 - 1)) != 0)
+		while (!is_power_of_2(big_pow2))
 			big_pow2++;
 		mgp->big_bytes = dev->mtu + ETH_HLEN + VLAN_HLEN + MXGEFW_PAD;
 	} else {