From d0b416019b470206f070e69577eb14009426aebb Mon Sep 17 00:00:00 2001
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Fri, 25 Jan 2013 10:20:39 +0000
Subject: [PATCH] --- yaml --- r: 351633 b: refs/heads/master c:
 1d9219ddb9a74ae80aa8d4f0492158224406c3fd h: refs/heads/master i:   351631:
 63edcc70f7214d198644e97442e00cf9c67fc2f9 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fe341ac00328..3cf05fdefce1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbab22c1f177e4b0e6f6ce4913cb24118f2b8440
+refs/heads/master: 1d9219ddb9a74ae80aa8d4f0492158224406c3fd
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 5cbf8c64e0f3..8b0f47a71964 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2142,7 +2142,7 @@ void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter)
 	}
 
 	head = kcalloc(adapter->fhash.fbucket_size,
-		       sizeof(struct hlist_head), GFP_KERNEL);
+		       sizeof(struct hlist_head), GFP_ATOMIC);
 
 	if (!head)
 		return;