Commit 38184b3b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

ipv4: Only compute net once in ip_rcv_finish

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ba1bf42
...@@ -314,6 +314,7 @@ EXPORT_SYMBOL(sysctl_ip_early_demux); ...@@ -314,6 +314,7 @@ EXPORT_SYMBOL(sysctl_ip_early_demux);
static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb) static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct net *net = dev_net(skb->dev);
struct rtable *rt; struct rtable *rt;
if (sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk) { if (sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk) {
...@@ -337,8 +338,7 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb) ...@@ -337,8 +338,7 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
iph->tos, skb->dev); iph->tos, skb->dev);
if (unlikely(err)) { if (unlikely(err)) {
if (err == -EXDEV) if (err == -EXDEV)
NET_INC_STATS_BH(dev_net(skb->dev), NET_INC_STATS_BH(net, LINUX_MIB_IPRPFILTER);
LINUX_MIB_IPRPFILTER);
goto drop; goto drop;
} }
} }
...@@ -359,11 +359,9 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb) ...@@ -359,11 +359,9 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
rt = skb_rtable(skb); rt = skb_rtable(skb);
if (rt->rt_type == RTN_MULTICAST) { if (rt->rt_type == RTN_MULTICAST) {
IP_UPD_PO_STATS_BH(dev_net(rt->dst.dev), IPSTATS_MIB_INMCAST, IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INMCAST, skb->len);
skb->len);
} else if (rt->rt_type == RTN_BROADCAST) } else if (rt->rt_type == RTN_BROADCAST)
IP_UPD_PO_STATS_BH(dev_net(rt->dst.dev), IPSTATS_MIB_INBCAST, IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INBCAST, skb->len);
skb->len);
return dst_input(skb); return dst_input(skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment