From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Aug 2019 18:54:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=446bf64b613c4433dac4b15f4eaf326beaad3c8e;p=linux.git

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

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.

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

446bf64b613c4433dac4b15f4eaf326beaad3c8e
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 5be3da6214994,00b2d4a86159f..c57f7533a6d0b
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -2057,15 -1839,18 +2061,20 @@@ static int parse_cls_flower(struct mlx5
  	struct mlx5_core_dev *dev = priv->mdev;
  	struct mlx5_eswitch *esw = dev->priv.eswitch;
  	struct mlx5e_rep_priv *rpriv = priv->ppriv;
- 	u8 match_level, tunnel_match_level = MLX5_MATCH_NONE;
  	struct mlx5_eswitch_rep *rep;
 +	bool is_eswitch_flow;
  	int err;
  
- 	err = __parse_cls_flower(priv, spec, f, filter_dev, &match_level, &tunnel_match_level);
+ 	inner_match_level = MLX5_MATCH_NONE;
+ 	outer_match_level = MLX5_MATCH_NONE;
+ 
+ 	err = __parse_cls_flower(priv, spec, f, filter_dev, &inner_match_level,
+ 				 &outer_match_level);
+ 	non_tunnel_match_level = (inner_match_level == MLX5_MATCH_NONE) ?
+ 				 outer_match_level : inner_match_level;
  
 -	if (!err && (flow->flags & MLX5E_TC_FLOW_ESWITCH)) {
 +	is_eswitch_flow = mlx5e_is_eswitch_flow(flow);
 +	if (!err && is_eswitch_flow) {
  		rep = rpriv->rep;
  		if (rep->vport != MLX5_VPORT_UPLINK &&
  		    (esw->offloads.inline_mode != MLX5_INLINE_MODE_NONE &&
@@@ -2079,11 -1864,11 +2088,11 @@@
  		}
  	}
  
 -	if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
 +	if (is_eswitch_flow) {
- 		flow->esw_attr->match_level = match_level;
- 		flow->esw_attr->tunnel_match_level = tunnel_match_level;
+ 		flow->esw_attr->inner_match_level = inner_match_level;
+ 		flow->esw_attr->outer_match_level = outer_match_level;
  	} else {
- 		flow->nic_attr->match_level = match_level;
+ 		flow->nic_attr->match_level = non_tunnel_match_level;
  	}
  
  	return err;
diff --cc drivers/net/netdevsim/dev.c
index c217049552f7b,bcc40a2366248..c5b026150bf51
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@@ -667,18 -280,10 +663,12 @@@ nsim_dev_create(struct nsim_bus_dev *ns
  	INIT_LIST_HEAD(&nsim_dev->port_list);
  	mutex_init(&nsim_dev->port_list_lock);
  	nsim_dev->fw_update_status = true;
 +	nsim_dev->max_macs = NSIM_DEV_MAX_MACS_DEFAULT;
 +	nsim_dev->test1 = NSIM_DEV_TEST1_DEFAULT;
  
- 	nsim_dev->fib_data = nsim_fib_create();
- 	if (IS_ERR(nsim_dev->fib_data)) {
- 		err = PTR_ERR(nsim_dev->fib_data);
- 		goto err_devlink_free;
- 	}
- 
  	err = nsim_dev_resources_register(devlink);
  	if (err)
- 		goto err_fib_destroy;
+ 		goto err_devlink_free;
  
  	err = devlink_register(devlink, &nsim_bus_dev->dev);
  	if (err)
@@@ -735,13 -316,8 +723,12 @@@ static void nsim_dev_destroy(struct nsi
  
  	nsim_bpf_dev_exit(nsim_dev);
  	nsim_dev_debugfs_exit(nsim_dev);
 +	nsim_dev_traps_exit(devlink);
 +	nsim_dev_dummy_region_exit(nsim_dev);
 +	devlink_params_unregister(devlink, nsim_devlink_params,
 +				  ARRAY_SIZE(nsim_devlink_params));
  	devlink_unregister(devlink);
  	devlink_resources_unregister(devlink, NULL);
- 	nsim_fib_destroy(nsim_dev->fib_data);
  	mutex_destroy(&nsim_dev->port_list_lock);
  	devlink_free(devlink);
  }