From: wenxu@ucloud.cn
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, marcelo.leitner@gmail.com
Subject: [PATCH net-next 2/2] openvswitch: using ip6_fragment in ipv6_stub
Date: Thu, 27 Aug 2020 18:39:52 +0800 [thread overview]
Message-ID: <1598524792-30597-3-git-send-email-wenxu@ucloud.cn> (raw)
In-Reply-To: <1598524792-30597-1-git-send-email-wenxu@ucloud.cn>
From: wenxu <wenxu@ucloud.cn>
Using ipv6_stub->ipv6_fragment to avoid the netfilter dependency
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
net/openvswitch/actions.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 2611657..1f3d406 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -9,7 +9,6 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/openvswitch.h>
-#include <linux/netfilter_ipv6.h>
#include <linux/sctp.h>
#include <linux/tcp.h>
#include <linux/udp.h>
@@ -848,11 +847,10 @@ static void ovs_fragment(struct net *net, struct vport *vport,
ip_do_fragment(net, skb->sk, skb, ovs_vport_output);
refdst_drop(orig_dst);
} else if (key->eth.type == htons(ETH_P_IPV6)) {
- const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
unsigned long orig_dst;
struct rt6_info ovs_rt;
- if (!v6ops)
+ if (!ipv6_stub->ipv6_fragment)
goto err;
prepare_frag(vport, skb, orig_network_offset,
@@ -866,7 +864,7 @@ static void ovs_fragment(struct net *net, struct vport *vport,
skb_dst_set_noref(skb, &ovs_rt.dst);
IP6CB(skb)->frag_max_size = mru;
- v6ops->fragment(net, skb->sk, skb, ovs_vport_output);
+ ipv6_stub->ipv6_fragment(net, skb->sk, skb, ovs_vport_output);
refdst_drop(orig_dst);
} else {
WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.",
--
1.8.3.1
prev parent reply other threads:[~2020-08-27 10:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 10:39 [PATCH net-next 0/2] Put ip6_fragment in ipv6_stub wenxu
2020-08-27 10:39 ` [PATCH net-next 1/2] ipv6: add ipv6_fragment hook " wenxu
2020-08-27 14:51 ` David Miller
2020-08-27 22:38 ` Marcelo Ricardo Leitner
2020-08-27 23:33 ` wenxu
2020-08-27 10:39 ` wenxu [this message]
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=1598524792-30597-3-git-send-email-wenxu@ucloud.cn \
--to=wenxu@ucloud.cn \
--cc=davem@davemloft.net \
--cc=marcelo.leitner@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox