diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:40:22 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:40:22 -0400 |
| commit | 87c89877792b10c9b0cfd1fd9d4a2f6373546086 (patch) | |
| tree | e56474d88a16bb36a60e23d4d03426c9eb482574 | |
| parent | 87a37f460e69f6a3d9d701b84005c2d24b558bcd (diff) | |
| download | longterm-queue-4.12-87c89877792b10c9b0cfd1fd9d4a2f6373546086.tar.gz | |
mellanox: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-mlx5e-Fix-features-check-of-IPv6-traffic.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/queue/net-mlx5e-Fix-features-check-of-IPv6-traffic.patch b/queue/net-mlx5e-Fix-features-check-of-IPv6-traffic.patch index f40b46d..a42424d 100644 --- a/queue/net-mlx5e-Fix-features-check-of-IPv6-traffic.patch +++ b/queue/net-mlx5e-Fix-features-check-of-IPv6-traffic.patch @@ -1,4 +1,4 @@ -From 2989ad1ec03021ee6d2193c35414f1d970a243de Mon Sep 17 00:00:00 2001 +From a7e92bf1bb6b8af5b9e50ac8c1a8738c8f8bf1bd Mon Sep 17 00:00:00 2001 From: Gal Pressman <galp@mellanox.com> Date: Tue, 21 Nov 2017 17:49:36 +0200 Subject: [PATCH] net/mlx5e: Fix features check of IPv6 traffic @@ -21,20 +21,21 @@ Now : 94,827.91 Mbps Fixes: b3f63c3d5e2c ("net/mlx5e: Add netdev support for VXLAN tunneling") Signed-off-by: Gal Pressman <galp@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c -index cbec66bc82f1..c535a44ab8ac 100644 +index 00b51252b803..619bab33d8d1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c -@@ -3678,6 +3678,7 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv, - struct sk_buff *skb, - netdev_features_t features) +@@ -3450,6 +3450,7 @@ static netdev_features_t mlx5e_vxlan_features_check(struct mlx5e_priv *priv, + struct sk_buff *skb, + netdev_features_t features) { + unsigned int offset = 0; struct udphdr *udph; - u8 proto; - u16 port; -@@ -3687,7 +3688,7 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv, + u16 proto; + u16 port = 0; +@@ -3459,7 +3460,7 @@ static netdev_features_t mlx5e_vxlan_features_check(struct mlx5e_priv *priv, proto = ip_hdr(skb)->protocol; break; case htons(ETH_P_IPV6): |