From b79b7eb52a0307d0b0c1b90fc6c8b25962166030 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 20 Mar 2013 09:33:19 -0700
Subject: [PATCH] --- yaml --- r: 368339 b: refs/heads/master c:
 70386d40e19eeff8696f2593755e78f6f7fa9e6d h: refs/heads/master i:   368337:
 d621e766da66d7824c1e72bfb92667a89a5ffcb0   368335:
 cb543c03fff0eafc1af7960a4cf01912f7a05856 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5dfa628c994f..1be949851472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdc929f5727d999d11ba3763b92f6eeacc096f9
+refs/heads/master: 70386d40e19eeff8696f2593755e78f6f7fa9e6d
diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
index 482976925154..89bef504d9dc 100644
--- a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -835,7 +835,7 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
 		struct sk_buff *skb;
 		dma_addr_t mapping;
 
-		skb = alloc_skb(q->rx_buffer_size, GFP_ATOMIC);
+		skb = dev_alloc_skb(q->rx_buffer_size);
 		if (!skb)
 			break;