ipv4: Only compute net once in ip_rcv_finish
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
4ba1bf4292
Коммит
38184b3b07
|
@ -314,6 +314,7 @@ EXPORT_SYMBOL(sysctl_ip_early_demux);
|
|||
static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
const struct iphdr *iph = ip_hdr(skb);
|
||||
struct net *net = dev_net(skb->dev);
|
||||
struct rtable *rt;
|
||||
|
||||
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)
|
|||
iph->tos, skb->dev);
|
||||
if (unlikely(err)) {
|
||||
if (err == -EXDEV)
|
||||
NET_INC_STATS_BH(dev_net(skb->dev),
|
||||
LINUX_MIB_IPRPFILTER);
|
||||
NET_INC_STATS_BH(net, LINUX_MIB_IPRPFILTER);
|
||||
goto drop;
|
||||
}
|
||||
}
|
||||
|
@ -359,11 +359,9 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
|
|||
|
||||
rt = skb_rtable(skb);
|
||||
if (rt->rt_type == RTN_MULTICAST) {
|
||||
IP_UPD_PO_STATS_BH(dev_net(rt->dst.dev), IPSTATS_MIB_INMCAST,
|
||||
skb->len);
|
||||
IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INMCAST, skb->len);
|
||||
} else if (rt->rt_type == RTN_BROADCAST)
|
||||
IP_UPD_PO_STATS_BH(dev_net(rt->dst.dev), IPSTATS_MIB_INBCAST,
|
||||
skb->len);
|
||||
IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INBCAST, skb->len);
|
||||
|
||||
return dst_input(skb);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче