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

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

Merge branch 'mellanox-net' 



Or Gerlitz says:

====================
mlx4 driver encapsulation/steering fixes

The 1st patch fixes a bug in the TX path that supports offloading the
TX checksum of (VXLAN) encapsulated TCP packets. It turns out that the
bug is revealed only when the receiver runs in non-offloaded mode, so
we somehow missed it so far... please queue it for -stable >= 3.14

The 2nd patch makes sure not to leak steering entry on error flow,
please queue it to 3.17-stable
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9cc233fb 571e1b2c

drivers/infiniband/hw/mlx4/main.c

+8 −2
Original line number Diff line number Diff line
@@ -1173,18 +1173,24 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
		err = __mlx4_ib_create_flow(qp, flow_attr, domain, type[i],

					    &mflow->reg_id[i]);

		if (err)

			goto err_free;

			goto err_create_flow;

		i++;

	}



	if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		err = mlx4_ib_tunnel_steer_add(qp, flow_attr, &mflow->reg_id[i]);

		if (err)

			goto err_free;

			goto err_create_flow;

		i++;

	}



	return &mflow->ibflow;



err_create_flow:

	while (i) {

		(void)__mlx4_ib_destroy_flow(to_mdev(qp->device)->dev, mflow->reg_id[i]);

		i--;

	}

err_free:

	kfree(mflow);

	return ERR_PTR(err);

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+5 −2
Original line number Diff line number Diff line
@@ -836,8 +836,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) 
	 * whether LSO is used */

	tx_desc->ctrl.srcrb_flags = priv->ctrl_flags;

	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {

		if (!skb->encapsulation)

			tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM |

								 MLX4_WQE_CTRL_TCP_UDP_CSUM);

		else

			tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM);

		ring->tx_csum++;

	}

drivers/net/ethernet/mellanox/mlx4/mcg.c

+4 −0
Original line number Diff line number Diff line
@@ -955,6 +955,10 @@ static void mlx4_err_rule(struct mlx4_dev *dev, char *str, 
					cur->ib.dst_gid_msk);

			break;



		case MLX4_NET_TRANS_RULE_ID_VXLAN:

			len += snprintf(buf + len, BUF_SIZE - len,

					"VNID = %d ", be32_to_cpu(cur->vxlan.vni));

			break;

		case MLX4_NET_TRANS_RULE_ID_IPV6:

			break;