From f1711711fe1916c5c6d96b65f14c1c58170c023a Mon Sep 17 00:00:00 2001 From: Amir Hanania Date: Thu, 28 Apr 2011 08:47:23 +0000 Subject: [PATCH] --- yaml --- r: 265349 b: refs/heads/master c: 0ebafd86656e5b74abb7b7c2a9b5b8458e836532 h: refs/heads/master i: 265347: 1ca72a30903a037682022ded9fdbf7cb299c2b9b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1218c17acfc9..50d64c2ea2f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5778b43dffe1d063368065d9549dd0019315a39 +refs/heads/master: 0ebafd86656e5b74abb7b7c2a9b5b8458e836532 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c index 824edae77865..e9b992fe5e46 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c @@ -241,10 +241,12 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, */ if (lastsize == bufflen) { if (j >= IXGBE_BUFFCNT_MAX) { - e_err(drv, "xid=%x:%d,%d,%d:addr=%llx " - "not enough user buffers. We need an extra " - "buffer because lastsize is bufflen.\n", - xid, i, j, dmacount, (u64)addr); + printk_once("Will NOT use DDP since there are not " + "enough user buffers. We need an extra " + "buffer because lastsize is bufflen. " + "xid=%x:%d,%d,%d:addr=%llx\n", + xid, i, j, dmacount, (u64)addr); + goto out_noddp_free; }