fix up queue-6.1/mlxsw-spectrum_router-add-support-for-double-entry-r.patch

fixes a build error

diff --git a/queue-6.1/mlxsw-spectrum_router-add-support-for-double-entry-r.patch b/queue-6.1/mlxsw-spectrum_router-add-support-for-double-entry-r.patch
index 344e101529ac884c4fe8ce9d99e7140091292e7f..60604614e4e23d102b741b78aa3bd671206cb6af 100644 (file)
--- a/queue-6.1/mlxsw-spectrum_router-add-support-for-double-entry-r.patch
+++ b/queue-6.1/mlxsw-spectrum_router-add-support-for-double-entry-r.patch
@@ -23,16 +23,14 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Stable-dep-of: 12ae97c531fc ("mlxsw: spectrum_ipip: Fix memory leak when changing remote IPv6 address")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c   | 1 +
- drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h   | 1 +
- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 +++
- 3 files changed, 5 insertions(+)
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c   |    1 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h   |    1 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c |    2 ++
+ 3 files changed, 4 insertions(+)
 
-diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
-index a2ee695a3f178..7ed4b64fecc7a 100644
 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
 +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
-@@ -433,6 +433,7 @@ static const struct mlxsw_sp_ipip_ops mlxsw_sp1_ipip_gre6_ops = {
+@@ -433,6 +433,7 @@ static const struct mlxsw_sp_ipip_ops ml
        .dev_type = ARPHRD_IP6GRE,
        .ul_proto = MLXSW_SP_L3_PROTO_IPV6,
        .inc_parsing_depth = true,
@@ -40,8 +38,6 @@ index a2ee695a3f178..7ed4b64fecc7a 100644
        .parms_init = mlxsw_sp1_ipip_netdev_parms_init_gre6,
        .nexthop_update = mlxsw_sp1_ipip_nexthop_update_gre6,
        .decap_config = mlxsw_sp1_ipip_decap_config_gre6,
-diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h
-index 8cc259dcc8d09..a35f009da5612 100644
 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h
 +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h
 @@ -49,6 +49,7 @@ struct mlxsw_sp_ipip_ops {
@@ -52,8 +48,6 @@ index 8cc259dcc8d09..a35f009da5612 100644
  
        struct mlxsw_sp_ipip_parms
        (*parms_init)(const struct net_device *ol_dev);
-diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
-index ab0aa1a61d4aa..37520ef598913 100644
 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
 +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
 @@ -77,6 +77,7 @@ struct mlxsw_sp_rif_params {
@@ -64,7 +58,7 @@ index ab0aa1a61d4aa..37520ef598913 100644
  };
  
  struct mlxsw_sp_rif_subport {
-@@ -1068,6 +1069,7 @@ mlxsw_sp_ipip_ol_ipip_lb_create(struct mlxsw_sp *mlxsw_sp,
+@@ -1068,6 +1069,7 @@ mlxsw_sp_ipip_ol_ipip_lb_create(struct m
        lb_params = (struct mlxsw_sp_rif_params_ipip_lb) {
                .common.dev = ol_dev,
                .common.lag = false,
@@ -72,14 +66,3 @@ index ab0aa1a61d4aa..37520ef598913 100644
                .lb_config = ipip_ops->ol_loopback_config(mlxsw_sp, ol_dev),
        };
  
-@@ -8081,6 +8083,7 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,
-                   const struct mlxsw_sp_rif_params *params,
-                   struct netlink_ext_ack *extack)
- {
-+      u8 rif_entries = params->double_entry ? 2 : 1;
-       u32 tb_id = l3mdev_fib_table(params->dev);
-       const struct mlxsw_sp_rif_ops *ops;
-       struct mlxsw_sp_fid *fid = NULL;
--- 
-2.43.0
-