---

yaml --- r: 203643 b: refs/heads/master c: 5575044 h: refs/heads/master i: 203641: f11f3bf 203639: c1ea419 v: v3
git-mirror · Jul 20, 2010 · 172e0ec · 172e0ec
1 parent 5489420
commit 172e0ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e09d7f6305fc9a1141bef116c7c02756d3bfa16
+refs/heads/master: 5575044661cfccd8b2f6e244031ef54499aa1dbb
diff --git a/trunk/drivers/net/ixgbe/ixgbe_fcoe.c b/trunk/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -190,7 +190,7 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
 	}
 
 	/* alloc the udl from our ddp pool */
-	ddp->udl = pci_pool_alloc(fcoe->pool, GFP_KERNEL, &ddp->udp);
+	ddp->udl = pci_pool_alloc(fcoe->pool, GFP_ATOMIC, &ddp->udp);
 	if (!ddp->udl) {
 		e_err(drv, "failed allocated ddp context\n");
 		goto out_noddp_unmap;