| From foo@baz Fri Nov 7 11:36:50 PST 2014 |
| From: Or Gerlitz <ogerlitz@mellanox.com> |
| Date: Thu, 30 Oct 2014 15:59:27 +0200 |
| Subject: net/mlx4_en: Don't attempt to TX offload the outer UDP checksum for VXLAN |
| |
| From: Or Gerlitz <ogerlitz@mellanox.com> |
| |
| [ Upstream commit a4f2dacbf2a5045e34b98a35d9a3857800f25a7b ] |
| |
| For VXLAN/NVGRE encapsulation, the current HW doesn't support offloading |
| both the outer UDP TX checksum and the inner TCP/UDP TX checksum. |
| |
| The driver doesn't advertize SKB_GSO_UDP_TUNNEL_CSUM, however we are wrongly |
| telling the HW to offload the outer UDP checksum for encapsulated packets, |
| fix that. |
| |
| Fixes: 837052d0ccc5 ('net/mlx4_en: Add netdev support for TCP/IP |
| offloads of vxlan tunneling') |
| Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c |
| +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c |
| @@ -808,8 +808,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff |
| tx_desc->ctrl.fence_size = (real_size / 16) & 0x3f; |
| tx_desc->ctrl.srcrb_flags = priv->ctrl_flags; |
| if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) { |
| - tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM | |
| - MLX4_WQE_CTRL_TCP_UDP_CSUM); |
| + 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++; |
| } |
| |
