From: Oz Shlomo <[email protected]>

[ Upstream commit 0d156f2deda8675c29fa2b8b5ed9b374370e47f2 ]

Set the ipv6 word fields according to the hardware definitions.

Fixes: ac991b48d43c ("net/mlx5e: CT: Offload established flows")
Signed-off-by: Oz Shlomo <[email protected]>
Reviewed-by: Roi Dayan <[email protected]>
Signed-off-by: Saeed Mahameed <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -320,21 +320,21 @@ mlx5_tc_ct_parse_mangle_to_mod_act(struc
 
        case FLOW_ACT_MANGLE_HDR_TYPE_IP6:
                MLX5_SET(set_action_in, modact, length, 0);
-               if (offset == offsetof(struct ipv6hdr, saddr))
+               if (offset == offsetof(struct ipv6hdr, saddr) + 12)
                        field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_31_0;
-               else if (offset == offsetof(struct ipv6hdr, saddr) + 4)
-                       field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_63_32;
                else if (offset == offsetof(struct ipv6hdr, saddr) + 8)
+                       field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_63_32;
+               else if (offset == offsetof(struct ipv6hdr, saddr) + 4)
                        field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_95_64;
-               else if (offset == offsetof(struct ipv6hdr, saddr) + 12)
+               else if (offset == offsetof(struct ipv6hdr, saddr))
                        field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_127_96;
-               else if (offset == offsetof(struct ipv6hdr, daddr))
+               else if (offset == offsetof(struct ipv6hdr, daddr) + 12)
                        field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_31_0;
-               else if (offset == offsetof(struct ipv6hdr, daddr) + 4)
-                       field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_63_32;
                else if (offset == offsetof(struct ipv6hdr, daddr) + 8)
+                       field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_63_32;
+               else if (offset == offsetof(struct ipv6hdr, daddr) + 4)
                        field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_95_64;
-               else if (offset == offsetof(struct ipv6hdr, daddr) + 12)
+               else if (offset == offsetof(struct ipv6hdr, daddr))
                        field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_127_96;
                else
                        return -EOPNOTSUPP;


Reply via email to