From: Saeed Mahameed <saeedm@mellanox.com>
Date: Wed, 17 Oct 2018 21:13:36 +0000 (-0700)
Subject: Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=186daf0c20507072e72a3c74db4ac50a5b6dae07;p=linux.git

Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux into net-next

mlx5 updates for both net-next and rdma-next

* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux: (21 commits)
  net/mlx5: Expose DC scatter to CQE capability bit
  net/mlx5: Update mlx5_ifc with DEVX UID bits
  net/mlx5: Set uid as part of DCT commands
  net/mlx5: Set uid as part of SRQ commands
  net/mlx5: Set uid as part of SQ commands
  net/mlx5: Set uid as part of RQ commands
  net/mlx5: Set uid as part of QP commands
  net/mlx5: Set uid as part of CQ commands
  net/mlx5: Rename incorrect naming in IFC file
  net/mlx5: Export packet reformat alloc/dealloc functions
  net/mlx5: Pass a namespace for packet reformat ID allocation
  net/mlx5: Expose new packet reformat capabilities
  {net, RDMA}/mlx5: Rename encap to reformat packet
  net/mlx5: Move header encap type to IFC header file
  net/mlx5: Break encap/decap into two separated flow table creation flags
  net/mlx5: Add support for more namespaces when allocating modify header
  net/mlx5: Export modify header alloc/dealloc functions
  net/mlx5: Add proper NIC TX steering flow tables support
  net/mlx5: Cleanup flow namespace getter switch logic
  net/mlx5: Add memic command opcode to command checker
  ...

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---

186daf0c20507072e72a3c74db4ac50a5b6dae07
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 6de21d9f4fad7,8cac8e9c8c634..acf7a847f5616
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -2617,10 -2551,8 +2617,10 @@@ vxlan_encap_offload_err
  
  	if (mlx5_vxlan_lookup_port(priv->mdev->vxlan, be16_to_cpu(key->tp_dst)) &&
  	    MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap)) {
- 		tunnel_type = MLX5_HEADER_TYPE_VXLAN;
+ 		tunnel_type = MLX5_REFORMAT_TYPE_L2_TO_VXLAN;
  	} else {
 +		NL_SET_ERR_MSG_MOD(extack,
 +				   "port isn't an offloaded vxlan udp dport");
  		netdev_warn(priv->netdev,
  			    "%d isn't an offloaded vxlan udp dport\n", be16_to_cpu(key->tp_dst));
  		return -EOPNOTSUPP;