From 75b21b22f51a57d42b13dcf73237da1002ebed73 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: 58730 b: refs/heads/master c:
 d9da466a3ce2ac005e05bb649a0f2cfb5c3d5d45 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a5ef6de129f2..38f7bec41de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de0d3dc0e8ecd80f602fac03feb8fd53d0c17a8c
+refs/heads/master: d9da466a3ce2ac005e05bb649a0f2cfb5c3d5d45
diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c
index 15defe4c4f05..6fd1e5241833 100644
--- a/trunk/drivers/net/cxgb3/cxgb3_main.c
+++ b/trunk/drivers/net/cxgb3/cxgb3_main.c
@@ -43,6 +43,7 @@
 #include <linux/proc_fs.h>
 #include <linux/rtnetlink.h>
 #include <linux/firmware.h>
+#include <linux/log2.h>
 #include <asm/uaccess.h>
 
 #include "common.h"
@@ -1818,8 +1819,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 			return -EBUSY;
 		if (copy_from_user(&m, useraddr, sizeof(m)))
 			return -EFAULT;
-		if (!m.rx_pg_sz || (m.rx_pg_sz & (m.rx_pg_sz - 1)) ||
-			!m.tx_pg_sz || (m.tx_pg_sz & (m.tx_pg_sz - 1)))
+		if (!is_power_of_2(m.rx_pg_sz) ||
+			!is_power_of_2(m.tx_pg_sz))
 			return -EINVAL;	/* not power of 2 */
 		if (!(m.rx_pg_sz & 0x14000))
 			return -EINVAL;	/* not 16KB or 64KB */