diff mbox series

[v3] seg6_iptunnel: Refactor seg6_lwt_headroom out of uapi header

Message ID 20200803073333.1998786-1-ioanaruxandra.stancioi@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series [v3] seg6_iptunnel: Refactor seg6_lwt_headroom out of uapi header | expand

Commit Message

Ioana-Ruxandra Stancioi Aug. 3, 2020, 7:33 a.m. UTC 
From: Ioana-Ruxandra Stăncioi <stancioi@google.com>

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>
---
v3:
* Apply David's suggestion and remove the inline tag.
---
 include/uapi/linux/seg6_iptunnel.h | 21 ---------------------
 net/ipv6/seg6_iptunnel.c           | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 21 deletions(-)

Comments

David Miller Aug. 4, 2020, 12:57 a.m. UTC | #1 
From: Ioana-Ruxandra Stancioi <ioanaruxandra.stancioi@gmail.com>
Date: Mon,  3 Aug 2020 07:33:33 +0000

> From: Ioana-Ruxandra Stăncioi <stancioi@google.com>
> 
> 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>

Applied, thank you.
diff mbox series

Patch

diff --git a/include/uapi/linux/seg6_iptunnel.h b/include/uapi/linux/seg6_iptunnel.h
index 09fb608a35ec..eb815e0d0ac3 100644
--- a/include/uapi/linux/seg6_iptunnel.h
+++ b/include/uapi/linux/seg6_iptunnel.h
@@ -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
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index e0e9f48ab14f..897fa59c47de 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -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[];