diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c index f58db453a97..25a3dfef33e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c @@ -20,6 +20,7 @@    the file called "COPYING".    Contact Information: +  Linux NICS <linux.nics@intel.com>    e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 @@ -407,13 +408,13 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,  	switch (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_FCSTAT)) {  	/* return 0 to bypass going to ULD for DDPed data */ -	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_DDP): +	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_DDP):  		/* update length of DDPed data */  		ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);  		rc = 0;  		break;  	/* unmap the sg list when FCPRSP is received */ -	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP): +	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP):  		dma_unmap_sg(&adapter->pdev->dev, ddp->sgl,  			     ddp->sgc, DMA_FROM_DEVICE);  		ddp->err = ddp_err; @@ -421,14 +422,14 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,  		ddp->sgc = 0;  		/* fall through */  	/* if DDP length is present pass it through to ULD */ -	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NODDP): +	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NODDP):  		/* update length of DDPed data */  		ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);  		if (ddp->len)  			rc = ddp->len;  		break;  	/* no match will return as an error */ -	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NOMTCH): +	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NOMTCH):  	default:  		break;  	} @@ -585,7 +586,7 @@ static int ixgbe_fcoe_dma_pool_alloc(struct ixgbe_fcoe *fcoe,  	struct dma_pool *pool;  	char pool_name[32]; -	snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu); +	snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%u", cpu);  	pool = dma_pool_create(pool_name, dev, IXGBE_FCPTR_MAX,  			       IXGBE_FCPTR_ALIGN, PAGE_SIZE);  | 
