You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
157 lines
4.8 KiB
157 lines
4.8 KiB
From 7004b16ea401b0d7634ec572614fefd8b410dfaa Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Sun, 10 May 2020 15:04:38 -0400
|
|
Subject: [PATCH 114/312] [netdrv] net/mlx5e: Fix build error without IPV6
|
|
|
|
Message-id: <20200510150452.10307-74-ahleihel@redhat.com>
|
|
Patchwork-id: 306696
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789380 v2 73/87] net/mlx5e: Fix build error without IPV6
|
|
Bugzilla: 1789380
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789380
|
|
Upstream: v5.5-rc1
|
|
Conflicts:
|
|
- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
|
|
Context diff due to already backported commit:
|
|
6c8991f41546 ("net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup")
|
|
|
|
commit 5f9fc3325ef95398c363b9b7813a7e99d4d85d7d
|
|
Author: YueHaibing <yuehaibing@huawei.com>
|
|
Date: Wed Nov 27 21:27:00 2019 +0800
|
|
|
|
net/mlx5e: Fix build error without IPV6
|
|
|
|
If IPV6 is not set and CONFIG_MLX5_ESWITCH is y,
|
|
building fails:
|
|
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c:322:5: error: redefinition of mlx5e_tc_tun_create_header_ipv6
|
|
int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
|
|
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
In file included from drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c:7:0:
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h:67:1: note: previous definition of mlx5e_tc_tun_create_header_ipv6 was here
|
|
mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
|
|
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Use #ifdef to guard this, also move mlx5e_route_lookup_ipv6
|
|
to cleanup unused warning.
|
|
|
|
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
Fixes: e689e998e102 ("net/mlx5e: TC, Stub out ipv6 tun create header function")
|
|
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
|
|
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
.../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 74 +++++++++++-----------
|
|
1 file changed, 38 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
|
|
index edcbcc3d3223..b855933f6bec 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
|
|
@@ -130,42 +130,6 @@ static const char *mlx5e_netdev_kind(struct net_device *dev)
|
|
return "unknown";
|
|
}
|
|
|
|
-static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,
|
|
- struct net_device *mirred_dev,
|
|
- struct net_device **out_dev,
|
|
- struct net_device **route_dev,
|
|
- struct flowi6 *fl6,
|
|
- struct neighbour **out_n,
|
|
- u8 *out_ttl)
|
|
-{
|
|
- struct dst_entry *dst;
|
|
- struct neighbour *n;
|
|
-
|
|
- int ret;
|
|
-
|
|
- dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(mirred_dev), NULL, fl6,
|
|
- NULL);
|
|
- if (IS_ERR(dst))
|
|
- return PTR_ERR(dst);
|
|
-
|
|
- if (!(*out_ttl))
|
|
- *out_ttl = ip6_dst_hoplimit(dst);
|
|
-
|
|
- ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev);
|
|
- if (ret < 0) {
|
|
- dst_release(dst);
|
|
- return ret;
|
|
- }
|
|
-
|
|
- n = dst_neigh_lookup(dst, &fl6->daddr);
|
|
- dst_release(dst);
|
|
- if (!n)
|
|
- return -ENOMEM;
|
|
-
|
|
- *out_n = n;
|
|
- return 0;
|
|
-}
|
|
-
|
|
static int mlx5e_gen_ip_tunnel_header(char buf[], __u8 *ip_proto,
|
|
struct mlx5e_encap_entry *e)
|
|
{
|
|
@@ -319,6 +283,43 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
|
|
return err;
|
|
}
|
|
|
|
+#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)
|
|
+static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,
|
|
+ struct net_device *mirred_dev,
|
|
+ struct net_device **out_dev,
|
|
+ struct net_device **route_dev,
|
|
+ struct flowi6 *fl6,
|
|
+ struct neighbour **out_n,
|
|
+ u8 *out_ttl)
|
|
+{
|
|
+ struct dst_entry *dst;
|
|
+ struct neighbour *n;
|
|
+
|
|
+ int ret;
|
|
+
|
|
+ dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(mirred_dev), NULL, fl6,
|
|
+ NULL);
|
|
+ if (IS_ERR(dst))
|
|
+ return PTR_ERR(dst);
|
|
+
|
|
+ if (!(*out_ttl))
|
|
+ *out_ttl = ip6_dst_hoplimit(dst);
|
|
+
|
|
+ ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev);
|
|
+ if (ret < 0) {
|
|
+ dst_release(dst);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ n = dst_neigh_lookup(dst, &fl6->daddr);
|
|
+ dst_release(dst);
|
|
+ if (!n)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ *out_n = n;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
|
|
struct net_device *mirred_dev,
|
|
struct mlx5e_encap_entry *e)
|
|
@@ -436,6 +437,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
|
|
neigh_release(n);
|
|
return err;
|
|
}
|
|
+#endif
|
|
|
|
bool mlx5e_tc_tun_device_to_offload(struct mlx5e_priv *priv,
|
|
struct net_device *netdev)
|
|
--
|
|
2.13.6
|
|
|