Skip to content

Commit

Permalink
seg6_iptunnel: Refactor seg6_lwt_headroom out of uapi header
Browse files Browse the repository at this point in the history
Refactor the function seg6_lwt_headroom out of the seg6_iptunnel.h uapi
header, because it is only used in seg6_iptunnel.c. Moreover, it is only
used in the kernel code, as indicated by the "#ifdef __KERNEL__".

Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: Ioana-Ruxandra Stăncioi <stancioi@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ioana-Ruxandra Stăncioi authored and David S. Miller committed Aug 4, 2020
1 parent 730e700 commit 88fab21
Showing 2 changed files with 17 additions and 21 deletions.
21 changes: 0 additions & 21 deletions include/uapi/linux/seg6_iptunnel.h
Original file line number Diff line number Diff line change
@@ -37,25 +37,4 @@ enum {
SEG6_IPTUN_MODE_L2ENCAP,
};

#ifdef __KERNEL__

static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)
{
int head = 0;

switch (tuninfo->mode) {
case SEG6_IPTUN_MODE_INLINE:
break;
case SEG6_IPTUN_MODE_ENCAP:
head = sizeof(struct ipv6hdr);
break;
case SEG6_IPTUN_MODE_L2ENCAP:
return 0;
}

return ((tuninfo->srh->hdrlen + 1) << 3) + head;
}

#endif

#endif
17 changes: 17 additions & 0 deletions net/ipv6/seg6_iptunnel.c
Original file line number Diff line number Diff line change
@@ -27,6 +27,23 @@
#include <net/seg6_hmac.h>
#endif

static size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)
{
int head = 0;

switch (tuninfo->mode) {
case SEG6_IPTUN_MODE_INLINE:
break;
case SEG6_IPTUN_MODE_ENCAP:
head = sizeof(struct ipv6hdr);
break;
case SEG6_IPTUN_MODE_L2ENCAP:
return 0;
}

return ((tuninfo->srh->hdrlen + 1) << 3) + head;
}

struct seg6_lwt {
struct dst_cache cache;
struct seg6_iptunnel_encap tuninfo[];

0 comments on commit 88fab21

Please sign in to comment.