From 172e0eca1502458f2fd27723b36af2d62b64004b Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Mon, 19 Jul 2010 14:00:24 +0000 Subject: [PATCH] --- yaml --- r: 203643 b: refs/heads/master c: 5575044661cfccd8b2f6e244031ef54499aa1dbb h: refs/heads/master i: 203641: f11f3bf3939efc2845a17005ed8c811ad3f98ef9 203639: c1ea419be42d42ddd6a81d15df78ac2202784718 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8155ad3dde57..7143005995c2 100644 --- 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 index 1737d2bddc19..072327c5e41a 100644 --- 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;