hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ip: factor out protocol delivery helper 

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

rfc v3 -> v1
 - add the helper declaration into the ip header

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2018-11-07 12:38:31 +01:00 committed by David S. Miller
parent bcd1665e35
commit 68cb7d531e
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/ip.h
View File

@ -155,6 +155,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
void ip_list_rcv(struct list_head *head, struct packet_type *pt, void ip_list_rcv(struct list_head *head, struct packet_type *pt,
struct net_device *orig_dev); struct net_device *orig_dev);
int ip_local_deliver(struct sk_buff *skb); int ip_local_deliver(struct sk_buff *skb);
void ip_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int proto);
int ip_mr_input(struct sk_buff *skb); int ip_mr_input(struct sk_buff *skb);
int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb); int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb);
int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb); int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb);

25
net/ipv4/ip_input.c
View File

@ -188,27 +188,20 @@ bool ip_call_ra_chain(struct sk_buff *skb)
return false; return false;
} }
static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb) void ip_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int protocol)
{ {
__skb_pull(skb, skb_network_header_len(skb));
rcu_read_lock();
{
int protocol = ip_hdr(skb)->protocol;
const struct net_protocol *ipprot; const struct net_protocol *ipprot;
int raw; int raw, ret;
resubmit: resubmit:
raw = raw_local_deliver(skb, protocol); raw = raw_local_deliver(skb, protocol);
ipprot = rcu_dereference(inet_protos[protocol]); ipprot = rcu_dereference(inet_protos[protocol]);
if (ipprot) { if (ipprot) {
int ret;
if (!ipprot->no_policy) { if (!ipprot->no_policy) {
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
kfree_skb(skb); kfree_skb(skb);
goto out; return;
} }
nf_reset(skb); nf_reset(skb);
} }
@ -231,8 +224,14 @@ static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_b
consume_skb(skb); consume_skb(skb);
} }
} }
} }
out:
static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
__skb_pull(skb, skb_network_header_len(skb));
rcu_read_lock();
ip_protocol_deliver_rcu(net, skb, ip_hdr(skb)->protocol);
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;