瀏覽代碼

Merge branch 'mlxsw-fixes'

Jiri Pirko says:

====================
mlxsw: Couple of fixes

Couple of fixes from Yotam.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 8 年之前
父節點
當前提交
03a1eabc3f
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/net/ethernet/mellanox/mlxsw/spectrum.c
  2. 1 1
      drivers/net/ethernet/mellanox/mlxsw/switchx2.c

+ 1 - 1
drivers/net/ethernet/mellanox/mlxsw/spectrum.c

@@ -2285,7 +2285,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
 	/* Each packet needs to have a Tx header (metadata) on top all other
 	/* Each packet needs to have a Tx header (metadata) on top all other
 	 * headers.
 	 * headers.
 	 */
 	 */
-	dev->hard_header_len += MLXSW_TXHDR_LEN;
+	dev->needed_headroom = MLXSW_TXHDR_LEN;
 
 
 	err = mlxsw_sp_port_system_port_mapping_set(mlxsw_sp_port);
 	err = mlxsw_sp_port_system_port_mapping_set(mlxsw_sp_port);
 	if (err) {
 	if (err) {

+ 1 - 1
drivers/net/ethernet/mellanox/mlxsw/switchx2.c

@@ -997,7 +997,7 @@ static int mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port)
 	/* Each packet needs to have a Tx header (metadata) on top all other
 	/* Each packet needs to have a Tx header (metadata) on top all other
 	 * headers.
 	 * headers.
 	 */
 	 */
-	dev->hard_header_len += MLXSW_TXHDR_LEN;
+	dev->needed_headroom = MLXSW_TXHDR_LEN;
 
 
 	err = mlxsw_sx_port_module_check(mlxsw_sx_port, &usable);
 	err = mlxsw_sx_port_module_check(mlxsw_sx_port, &usable);
 	if (err) {
 	if (err) {