Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efad54a1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-fixes' 



Saeed Mahameed says:

====================
Mellanox mlx5 fixes 2017-03-21

This series contains some mlx5 core and ethernet driver fixes.

For -stable:
net/mlx5e: Count LRO packets correctly (for kernel >= 4.2)
net/mlx5e: Count GSO packets correctly (for kernel >= 4.2)
net/mlx5: Increase number of max QPs in default profile (for kernel >= 4.0)
net/mlx5e: Avoid supporting udp tunnel port ndo for VF reps (for kernel >= 4.10)
net/mlx5e: Use the proper UAPI values when offloading TC vlan actions (for kernel >= v4.9)
net/mlx5: E-Switch, Don't allow changing inline mode when flows are configured (for kernel >= 4.10)
net/mlx5e: Change the TC offload rule add/del code path to be per NIC or E-Switch (for kernel >= 4.10)
net/mlx5: Add missing entries for set/query rate limit commands (for kernel >= 4.8)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bf601fe5 8ab7e2ae

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_VPORT_COUNTER:

	case MLX5_CMD_OP_ALLOC_Q_COUNTER:

	case MLX5_CMD_OP_QUERY_Q_COUNTER:

	case MLX5_CMD_OP_SET_RATE_LIMIT:

	case MLX5_CMD_OP_QUERY_RATE_LIMIT:

	case MLX5_CMD_OP_ALLOC_PD:

	case MLX5_CMD_OP_ALLOC_UAR:

	case MLX5_CMD_OP_CONFIG_INT_MODERATION:
@@ -497,6 +499,8 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(ALLOC_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(DEALLOC_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(SET_RATE_LIMIT);

	MLX5_COMMAND_STR_CASE(QUERY_RATE_LIMIT);

	MLX5_COMMAND_STR_CASE(ALLOC_PD);

	MLX5_COMMAND_STR_CASE(DEALLOC_PD);

	MLX5_COMMAND_STR_CASE(ALLOC_UAR);

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −4
Original line number Diff line number Diff line
@@ -928,10 +928,6 @@ void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, struct mlx5e_priv *priv); 
int mlx5e_attach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev);

void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev);

u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout);

void mlx5e_add_vxlan_port(struct net_device *netdev,

			  struct udp_tunnel_info *ti);

void mlx5e_del_vxlan_port(struct net_device *netdev,

			  struct udp_tunnel_info *ti);



int mlx5e_get_offload_stats(int attr_id, const struct net_device *dev,

			    void *sp);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3100,7 +3100,7 @@ static int mlx5e_get_vf_stats(struct net_device *dev, 
					    vf_stats);

}



void mlx5e_add_vxlan_port(struct net_device *netdev,

static void mlx5e_add_vxlan_port(struct net_device *netdev,

				 struct udp_tunnel_info *ti)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);
@@ -3114,7 +3114,7 @@ void mlx5e_add_vxlan_port(struct net_device *netdev, 
	mlx5e_vxlan_queue_work(priv, ti->sa_family, be16_to_cpu(ti->port), 1);

}



void mlx5e_del_vxlan_port(struct net_device *netdev,

static void mlx5e_del_vxlan_port(struct net_device *netdev,

				 struct udp_tunnel_info *ti)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −2
Original line number Diff line number Diff line
@@ -393,8 +393,6 @@ static const struct net_device_ops mlx5e_netdev_ops_rep = { 
	.ndo_get_phys_port_name  = mlx5e_rep_get_phys_port_name,

	.ndo_setup_tc            = mlx5e_rep_ndo_setup_tc,

	.ndo_get_stats64         = mlx5e_rep_get_stats,

	.ndo_udp_tunnel_add      = mlx5e_add_vxlan_port,

	.ndo_udp_tunnel_del      = mlx5e_del_vxlan_port,

	.ndo_has_offload_stats	 = mlx5e_has_offload_stats,

	.ndo_get_offload_stats	 = mlx5e_get_offload_stats,

};

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+4 −0
Original line number Diff line number Diff line
@@ -601,6 +601,10 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, 
	if (lro_num_seg > 1) {

		mlx5e_lro_update_hdr(skb, cqe, cqe_bcnt);

		skb_shinfo(skb)->gso_size = DIV_ROUND_UP(cqe_bcnt, lro_num_seg);

		/* Subtract one since we already counted this as one

		 * "regular" packet in mlx5e_complete_rx_cqe()

		 */

		rq->stats.packets += lro_num_seg - 1;

		rq->stats.lro_packets++;

		rq->stats.lro_bytes += cqe_bcnt;

	}