[Intel-wired-lan] [next PATCH S41 5/5] i40e: refactor tail_bump check

[Wyborny, Carolyn]

The description and title needs to change on this.  I did send an email.  Let me know if you need a resend.

Thanks,

Carolyn

> -----Original Message-----
> From: Pujari, Bimmy
> Sent: Wednesday, August 03, 2016 10:20 AM
> To: intel-wired-lan at lists.osuosl.org
> Cc: Wyborny, Carolyn <carolyn.wyborny at intel.com>
> Subject: [next PATCH S41 5/5] i40e: refactor tail_bump check
> 
> From: Carolyn Wyborny <carolyn.wyborny at intel.com>
> 
> This patch fixes usage of variable so that its
> not checked for NULL if there's no possiblity of
> it being NULL. Without this patch, static analysis
> tool complain. This patch fixes the problem by
> changing the wrapping of compat code.
> 
> Signed-off-by: Carolyn Wyborny <carolyn.wyborny at intel.com>
> Change-ID: Ide0e19171d67d90cb2b06b8dcd4fa791ae120160
> ---
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   | 6 ++----
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 ++----
>  2 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> index 5eb9ff2..266608a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> @@ -2849,10 +2849,9 @@ static inline void i40e_tx_map(struct i40e_ring
> *tx_ring, struct sk_buff *skb,
> 
> I40E_TXD_QW1_CMD_SHIFT);
> 
>  	/* notify HW of packet */
> -	if (!tail_bump)
> +	if (!tail_bump) {
>  		prefetchw(tx_desc + 1);
> -
> -	if (tail_bump) {
> +	} else {
>  		/* Force memory writes to complete before letting h/w
>  		 * know there are new descriptors to fetch.  (Only
>  		 * applicable for weak-ordered memory model archs,
> @@ -2861,7 +2860,6 @@ static inline void i40e_tx_map(struct i40e_ring
> *tx_ring, struct sk_buff *skb,
>  		wmb();
>  		writel(i, tx_ring->tail);
>  	}
> -
>  	return;
> 
>  dma_error:
> diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> index 5968cc6..f3eb76f 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> @@ -2086,10 +2086,9 @@ static inline void i40evf_tx_map(struct i40e_ring
> *tx_ring, struct sk_buff *skb,
> 
> I40E_TXD_QW1_CMD_SHIFT);
> 
>  	/* notify HW of packet */
> -	if (!tail_bump)
> +	if (!tail_bump) {
>  		prefetchw(tx_desc + 1);
> -
> -	if (tail_bump) {
> +	} else {
>  		/* Force memory writes to complete before letting h/w
>  		 * know there are new descriptors to fetch.  (Only
>  		 * applicable for weak-ordered memory model archs,
> @@ -2098,7 +2097,6 @@ static inline void i40evf_tx_map(struct i40e_ring
> *tx_ring, struct sk_buff *skb,
>  		wmb();
>  		writel(i, tx_ring->tail);
>  	}
> -
>  	return;
> 
>  dma_error:
> --
> 2.4.11