Subject: Re: [net-next 09/13] igb: Pull adapter out of main path in igb_xmit_frame_ring

From: Sergei Shtylyov <[email-masked]>
Date: Thu, 04 Apr 2013 18:15:25 +0400

Hello.

On 04-04-2013 15:37, Jeff Kirsher wrote:

> From: Alexander Duyck <[email-masked]>

> We only need the adapter pointer in the case of ptp.  As such we can pull the
> adapter out of the main path and place it inside the if statement to avoid
> the temptation of accessing the adapter pointer in the fast path.

> Signed-off-by: Alexander Duyck <[email-masked]>
> Tested-by: Aaron Brown <[email-masked]>
> Signed-off-by: Jeff Kirsher <[email-masked]>

   Two minor nits.

> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index 29facb5..6043245 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
[...]
> @@ -4628,15 +4627,17 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
>
>   	skb_tx_timestamp(skb);
>
> -	if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
> -		     !(adapter->ptp_tx_skb))) {
> -		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
> -		tx_flags |= IGB_TX_FLAGS_TSTAMP;
> +	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
> +		struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);

    An empty line wouldn't hurt here.

> +		if (!(adapter->ptp_tx_skb)) {

    Parens not needed here.

WBR, Sergei