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

Commit 4d5e76f4 authored by Paolo Abeni's avatar Paolo Abeni Committed by Sean Tranchetti
Browse files

ipv6: factor out protocol delivery helper 



So that we can re-use it at the UDP level in the next patch

rfc v3 -> v1:
 - add the helper declaration into the ipv6 header

Change-Id: I36df5e1c5cc4ccc2113b30c2f19a5f4cb10792e1
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git


Git-commit: 80bde363f9a43d942e404821b966e362131cd0ca
Signed-off-by: default avatarSean Tranchetti <stranche@codeaurora.org>
parent 0ef083d3

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -975,6 +975,8 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb); 
int ip6_forward(struct sk_buff *skb);

int ip6_input(struct sk_buff *skb);

int ip6_mc_input(struct sk_buff *skb);

void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,

			      bool have_final);



int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);

int ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb);

net/ipv6/ip6_input.c

+16 −12
Original line number Diff line number Diff line
@@ -318,28 +318,26 @@ void ipv6_list_rcv(struct list_head *head, struct packet_type *pt, 
/*

 *	Deliver the packet to the host

 */





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

void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,

			      bool have_final)

{

	const struct inet6_protocol *ipprot;

	struct inet6_dev *idev;

	unsigned int nhoff;

	int nexthdr;

	bool raw;

	bool have_final = false;



	/*

	 *	Parse extension headers

	 */



	rcu_read_lock();

resubmit:

	idev = ip6_dst_idev(skb_dst(skb));

	nhoff = IP6CB(skb)->nhoff;

	if (!have_final) {

		if (!pskb_pull(skb, skb_transport_offset(skb)))

			goto discard;

	nhoff = IP6CB(skb)->nhoff;

		nexthdr = skb_network_header(skb)[nhoff];

	}



resubmit_final:

	raw = raw6_local_deliver(skb, nexthdr);
@@ -410,13 +408,19 @@ static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *sk 
			consume_skb(skb);

		}

	}

	rcu_read_unlock();

	return 0;

	return;



discard:

	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);

	rcu_read_unlock();

	kfree_skb(skb);

}



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

{

	rcu_read_lock();

	ip6_protocol_deliver_rcu(net, skb, 0, false);

	rcu_read_unlock();



	return 0;

}