From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH ipsec-next 5/7] xfrm: place xfrm6_local_dontfrag in xfrm.h
Date: Tue, 28 Apr 2020 13:40:26 +0200 [thread overview]
Message-ID: <20200428114028.20693-6-fw@strlen.de> (raw)
In-Reply-To: <20200428114028.20693-1-fw@strlen.de>
so next patch can re-use it from net/xfrm/xfrm_output.c without
causing a linker error when IPV6 is a module.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
include/net/xfrm.h | 16 ++++++++++++++++
net/ipv6/xfrm6_output.c | 21 ++-------------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 4d8be0649464..6b7295fb6e4d 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1988,4 +1988,20 @@ static inline int xfrm_tunnel_check(struct sk_buff *skb, struct xfrm_state *x,
return 0;
}
+
+#if IS_ENABLED(CONFIG_IPV6)
+static inline bool xfrm6_local_dontfrag(const struct sock *sk)
+{
+ int proto;
+
+ if (!sk || sk->sk_family != AF_INET6)
+ return false;
+
+ proto = sk->sk_protocol;
+ if (proto == IPPROTO_UDP || proto == IPPROTO_RAW)
+ return inet6_sk(sk)->dontfrag;
+
+ return false;
+}
+#endif
#endif /* _NET_XFRM_H */
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 23e2b52cfba6..be64f280510c 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -23,23 +23,6 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
}
EXPORT_SYMBOL(xfrm6_find_1stfragopt);
-static int xfrm6_local_dontfrag(struct sk_buff *skb)
-{
- int proto;
- struct sock *sk = skb->sk;
-
- if (sk) {
- if (sk->sk_family != AF_INET6)
- return 0;
-
- proto = sk->sk_protocol;
- if (proto == IPPROTO_UDP || proto == IPPROTO_RAW)
- return inet6_sk(sk)->dontfrag;
- }
-
- return 0;
-}
-
void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)
{
struct flowi6 fl6;
@@ -82,7 +65,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb)
skb->dev = dst->dev;
skb->protocol = htons(ETH_P_IPV6);
- if (xfrm6_local_dontfrag(skb))
+ if (xfrm6_local_dontfrag(skb->sk))
xfrm6_local_rxpmtu(skb, mtu);
else if (skb->sk)
xfrm_local_error(skb, mtu);
@@ -181,7 +164,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
toobig = skb->len > mtu && !skb_is_gso(skb);
- if (toobig && xfrm6_local_dontfrag(skb)) {
+ if (toobig && xfrm6_local_dontfrag(skb->sk)) {
xfrm6_local_rxpmtu(skb, mtu);
kfree_skb(skb);
return -EMSGSIZE;
--
2.26.2
next prev parent reply other threads:[~2020-04-28 11:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 11:40 [PATCH ipsec-next 0/7] xfrm: remove three more indirect calls from packet path Florian Westphal
2020-04-28 11:40 ` [PATCH ipsec-next 1/7] xfrm: avoid extract_output indirection for ipv4 Florian Westphal
2020-04-28 11:40 ` [PATCH ipsec-next 2/7] xfrm: state: remove extract_input indirection from xfrm_state_afinfo Florian Westphal
2020-04-28 11:40 ` [PATCH ipsec-next 3/7] xfrm: move xfrm4_extract_header to common helper Florian Westphal
2020-04-28 11:40 ` [PATCH ipsec-next 4/7] xfrm: expose local_rxpmtu via ipv6_stubs Florian Westphal
2020-04-28 11:40 ` Florian Westphal [this message]
2020-04-28 11:40 ` [PATCH ipsec-next 6/7] xfrm: remove extract_output indirection from xfrm_state_afinfo Florian Westphal
2020-04-28 11:40 ` [PATCH ipsec-next 7/7] xfrm: remove output_finish " Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428114028.20693-6-fw@strlen.de \
--to=fw@strlen.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.