Re: [PATCH 7.0, 6.18] net: dovetail: Fix wrongly merged comments

Jan Kiszka <[email protected]> writes:

> From: Jan Kiszka <[email protected]>
>
> No functional changes.
>
> Signed-off-by: Jan Kiszka <[email protected]>
> ---
>  include/linux/netdevice.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 2285dec50589b..b59673d4f3fda 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -5001,18 +5001,16 @@ static inline bool __netif_tx_trylock(struct netdev_queue *txq)
>  
>  static inline void __netif_tx_unlock(struct netdev_queue *txq)
>  {
> -	/* Pairs with READ_ONCE() in netif_tx_owned() */
>  	netif_tx_unlock_oob(txq);
> -	/* Pairs with READ_ONCE() in __dev_queue_xmit() */
> +	/* Pairs with READ_ONCE() in netif_tx_owned() */
>  	WRITE_ONCE(txq->xmit_lock_owner, -1);
>  	spin_unlock(&txq->_xmit_lock);
>  }
>  
>  static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
>  {
> -	/* Pairs with READ_ONCE() in netif_tx_owned() */
>  	netif_tx_unlock_oob(txq);
> -	/* Pairs with READ_ONCE() in __dev_queue_xmit() */
> +	/* Pairs with READ_ONCE() in netif_tx_owned() */
>  	WRITE_ONCE(txq->xmit_lock_owner, -1);
>  	spin_unlock_bh(&txq->_xmit_lock);
>  }

Merged, thanks.

-- 
Philippe.