Skip to content

Commit

Permalink
seg6: factor out End lookup nexthop processing to a dedicated function
Browse files Browse the repository at this point in the history
The End nexthop lookup/input operations are moved into a new helper
function named input_action_end_finish(). This avoids duplicating the
code needed to compute the nexthop in the different flavors of the End
behavior.

Signed-off-by: Andrea Mayer <andrea.mayer@uniroma2.it>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Andrea Mayer authored and Paolo Abeni committed Feb 16, 2023
1 parent f5b12be commit 525c65f
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions net/ipv6/seg6_local.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,14 @@ static void seg6_next_csid_advance_arg(struct in6_addr *addr,
memset(&addr->s6_addr[16 - fnc_octects], 0x00, fnc_octects);
}

static int input_action_end_finish(struct sk_buff *skb,
struct seg6_local_lwt *slwt)
{
seg6_lookup_nexthop(skb, NULL, 0);

return dst_input(skb);
}

static int input_action_end_core(struct sk_buff *skb,
struct seg6_local_lwt *slwt)
{
Expand All @@ -375,9 +383,7 @@ static int input_action_end_core(struct sk_buff *skb,

advance_nextseg(srh, &ipv6_hdr(skb)->daddr);

seg6_lookup_nexthop(skb, NULL, 0);

return dst_input(skb);
return input_action_end_finish(skb, slwt);

drop:
kfree_skb(skb);
Expand All @@ -395,9 +401,7 @@ static int end_next_csid_core(struct sk_buff *skb, struct seg6_local_lwt *slwt)
/* update DA */
seg6_next_csid_advance_arg(daddr, finfo);

seg6_lookup_nexthop(skb, NULL, 0);

return dst_input(skb);
return input_action_end_finish(skb, slwt);
}

static bool seg6_next_csid_enabled(__u32 fops)
Expand Down

0 comments on commit 525c65f

Please sign in to comment.