diff options
-rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 11 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h index 206ecc69b51c..534a8be6a6db 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h | |||
@@ -383,6 +383,17 @@ static inline void mlxsw_sp_port_dcb_fini(struct mlxsw_sp_port *mlxsw_sp_port) | |||
383 | #endif | 383 | #endif |
384 | 384 | ||
385 | /* spectrum_router.c */ | 385 | /* spectrum_router.c */ |
386 | enum mlxsw_sp_l3proto { | ||
387 | MLXSW_SP_L3_PROTO_IPV4, | ||
388 | MLXSW_SP_L3_PROTO_IPV6, | ||
389 | #define MLXSW_SP_L3_PROTO_MAX (MLXSW_SP_L3_PROTO_IPV6 + 1) | ||
390 | }; | ||
391 | |||
392 | union mlxsw_sp_l3addr { | ||
393 | __be32 addr4; | ||
394 | struct in6_addr addr6; | ||
395 | }; | ||
396 | |||
386 | int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp); | 397 | int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp); |
387 | void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp); | 398 | void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp); |
388 | int mlxsw_sp_netdevice_router_port_event(struct net_device *dev); | 399 | int mlxsw_sp_netdevice_router_port_event(struct net_device *dev); |
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h index 354cb0834f3a..3dbafdeaab2b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h | |||
@@ -7,17 +7,6 @@ | |||
7 | #include "spectrum.h" | 7 | #include "spectrum.h" |
8 | #include "reg.h" | 8 | #include "reg.h" |
9 | 9 | ||
10 | enum mlxsw_sp_l3proto { | ||
11 | MLXSW_SP_L3_PROTO_IPV4, | ||
12 | MLXSW_SP_L3_PROTO_IPV6, | ||
13 | #define MLXSW_SP_L3_PROTO_MAX (MLXSW_SP_L3_PROTO_IPV6 + 1) | ||
14 | }; | ||
15 | |||
16 | union mlxsw_sp_l3addr { | ||
17 | __be32 addr4; | ||
18 | struct in6_addr addr6; | ||
19 | }; | ||
20 | |||
21 | struct mlxsw_sp_rif_ipip_lb; | 10 | struct mlxsw_sp_rif_ipip_lb; |
22 | struct mlxsw_sp_rif_ipip_lb_config { | 11 | struct mlxsw_sp_rif_ipip_lb_config { |
23 | enum mlxsw_reg_ritr_loopback_ipip_type lb_ipipt; | 12 | enum mlxsw_reg_ritr_loopback_ipip_type lb_ipipt; |