[Intel-wired-lan] [next PATCH S97 1/7] i40e: Fix for xdp frame struct usage

[Shannon Nelson]

On 10/4/2018 3:18 PM, Alice Michael wrote:
> From: Jan Sokolowski <jan.sokolowski at intel.com>
> 
> Current ifdefs used for xdp frame structs and methods
> are not properly used, thus failing to build.
> 
> Use proper definitions for sections of code using xdp_frame.

Since there are no ifdefs around this in the upstream code, this commit 
message makes no sense.

Also, you're removing a bit of whitespace that should probably be left 
alone.

sln

> 
> Signed-off-by: Jan Sokolowski <jan.sokolowski at intel.com>
> ---
>   drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> index 740ea58..c9d209a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> @@ -3527,6 +3527,7 @@ static int i40e_xmit_xdp_ring(struct xdp_frame *xdpf,
>   	u16 i = xdp_ring->next_to_use;
>   	struct i40e_tx_buffer *tx_bi;
>   	struct i40e_tx_desc *tx_desc;
> +	void *data = xdpf->data;
>   	u32 size = xdpf->len;
>   	dma_addr_t dma;
>   
> @@ -3534,8 +3535,7 @@ static int i40e_xmit_xdp_ring(struct xdp_frame *xdpf,
>   		xdp_ring->tx_stats.tx_busy++;
>   		return I40E_XDP_CONSUMED;
>   	}
> -
> -	dma = dma_map_single(xdp_ring->dev, xdpf->data, size, DMA_TO_DEVICE);
> +	dma = dma_map_single(xdp_ring->dev, data, size, DMA_TO_DEVICE);
>   	if (dma_mapping_error(xdp_ring->dev, dma))
>   		return I40E_XDP_CONSUMED;
>   
>