Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 188515fb authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

openvswitch: Pass net into ovs_vport_output 



When struct net starts being passed through the ipv4 and ipv6 fragment
routines ovs_vport_output will need to take a net parameter.
Prepare ovs_vport_output before that is needed and introduce
ovs_vport_output_skk for the call sites that still need the old
calling conventions.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 4bf1b54f

net/openvswitch/actions.c

+8 −3
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int set_sctp(struct sk_buff *skb, struct sw_flow_key *flow_key, 
	return 0;

}



static int ovs_vport_output(struct sock *sock, struct sk_buff *skb)

static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	struct ovs_frag_data *data = this_cpu_ptr(&ovs_frag_data_storage);

	struct vport *vport = data->vport;
@@ -645,6 +645,11 @@ static int ovs_vport_output(struct sock *sock, struct sk_buff *skb) 
	ovs_vport_send(vport, skb);

	return 0;

}

static int ovs_vport_output_sk(struct sock *sk, struct sk_buff *skb)

{

	struct net *net = dev_net(skb_dst(skb)->dev);

	return ovs_vport_output(net, sk, skb);

}



static unsigned int

ovs_dst_get_mtu(const struct dst_entry *dst)
@@ -700,7 +705,7 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, 
		skb_dst_set_noref(skb, &ovs_dst);

		IPCB(skb)->frag_max_size = mru;



		ip_do_fragment(skb->sk, skb, ovs_vport_output);

		ip_do_fragment(skb->sk, skb, ovs_vport_output_sk);

		refdst_drop(orig_dst);

	} else if (ethertype == htons(ETH_P_IPV6)) {

		const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
@@ -722,7 +727,7 @@ static void ovs_fragment(struct vport *vport, struct sk_buff *skb, u16 mru, 
		skb_dst_set_noref(skb, &ovs_rt.dst);

		IP6CB(skb)->frag_max_size = mru;



		v6ops->fragment(skb->sk, skb, ovs_vport_output);

		v6ops->fragment(skb->sk, skb, ovs_vport_output_sk);

		refdst_drop(orig_dst);

	} else {

		WARN_ONCE(1, "Failed fragment ->%s: eth=%04x, MRU=%d, MTU=%d.",