From 1d55c537b488516857ea75b2fe6d679180f078de Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 26 Jul 2007 17:35:19 +0100
Subject: [PATCH] --- yaml --- r: 62957 b: refs/heads/master c:
 1f41bb3a5a24c82900b33071edcedec679b99de7 h: refs/heads/master i:   62955:
 5f2078049774f3254ecd28e938620cac293ff75b v: v3

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

diff --git a/[refs] b/[refs]
index 7d77469a83d7..79053097569d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af3b162afd9fce69a94d79bd5b1f9c7c302212f4
+refs/heads/master: 1f41bb3a5a24c82900b33071edcedec679b99de7
diff --git a/trunk/drivers/net/cxgb3/cxgb3_offload.c b/trunk/drivers/net/cxgb3/cxgb3_offload.c
index ebcf35e4cf5b..e620ed4c3ff0 100644
--- a/trunk/drivers/net/cxgb3/cxgb3_offload.c
+++ b/trunk/drivers/net/cxgb3/cxgb3_offload.c
@@ -699,7 +699,7 @@ static int do_cr(struct t3cdev *dev, struct sk_buff *skb)
  * the buffer.
  */
 static struct sk_buff *cxgb3_get_cpl_reply_skb(struct sk_buff *skb, size_t len,
-					       int gfp)
+					       gfp_t gfp)
 {
 	if (likely(!skb_cloned(skb))) {
 		BUG_ON(skb->len < len);