Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[sfrench/cifs-2.6.git] / drivers / net / cxgb3 / cxgb3_offload.c

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index ebcf35e4cf5b45db0c7ffda9054c20d7982e826b..e620ed4c3ff0b5fb7aaa8650cc0315f2f4a714f8 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/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);