From: David S. Miller <davem@davemloft.net>
Date: Fri, 5 Apr 2019 21:14:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d;p=linux.git

Merge git://git./linux/kernel/git/davem/net

Minor comment merge conflict in mlx5.

Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
index b0ce68feb0f33,4ab0d030b5448..633b117eb13e8
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
@@@ -165,25 -167,25 +167,25 @@@ static int update_xoff_threshold(struc
  }
  
  /**
 - * update_buffer_lossy()
 - *   max_mtu: netdev's max_mtu
 - *   pfc_en: <input> current pfc configuration
 - *   buffer: <input> current prio to buffer mapping
 - *   xoff:   <input> xoff value
 - *   port_buffer: <output> port receive buffer configuration
 - *   change: <output>
 + *	update_buffer_lossy	- Update buffer configuration based on pfc
-  *	@mtu: device's MTU
++ *	@max_mtu: netdev's max_mtu
 + *	@pfc_en: <input> current pfc configuration
 + *	@buffer: <input> current prio to buffer mapping
 + *	@xoff:   <input> xoff value
 + *	@port_buffer: <output> port receive buffer configuration
 + *	@change: <output>
   *
 - *   Update buffer configuration based on pfc configuraiton and priority
 - *   to buffer mapping.
 - *   Buffer's lossy bit is changed to:
 - *     lossless if there is at least one PFC enabled priority mapped to this buffer
 - *     lossy if all priorities mapped to this buffer are PFC disabled
 + *	Update buffer configuration based on pfc configuraiton and
 + *	priority to buffer mapping.
 + *	Buffer's lossy bit is changed to:
 + *		lossless if there is at least one PFC enabled priority
 + *		mapped to this buffer lossy if all priorities mapped to
 + *		this buffer are PFC disabled
   *
 - *   Return:
 - *     Return 0 if no error.
 - *     Set change to true if buffer configuration is modified.
 + *	@return: 0 if no error,
 + *	sets change to true if buffer configuration was modified.
   */
- static int update_buffer_lossy(unsigned int mtu,
+ static int update_buffer_lossy(unsigned int max_mtu,
  			       u8 pfc_en, u8 *buffer, u32 xoff,
  			       struct mlx5e_port_buffer *port_buffer,
  			       bool *change)