|
@@ -230,16 +230,16 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
|
|
|
protocol = -ret;
|
|
|
goto resubmit;
|
|
|
}
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INDELIVERS);
|
|
|
+ IP_INC_STATS_BH(net, IPSTATS_MIB_INDELIVERS);
|
|
|
} else {
|
|
|
if (!raw) {
|
|
|
if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INUNKNOWNPROTOS);
|
|
|
+ IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
|
|
|
icmp_send(skb, ICMP_DEST_UNREACH,
|
|
|
ICMP_PROT_UNREACH, 0);
|
|
|
}
|
|
|
} else
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INDELIVERS);
|
|
|
+ IP_INC_STATS_BH(net, IPSTATS_MIB_INDELIVERS);
|
|
|
kfree_skb(skb);
|
|
|
}
|
|
|
}
|
|
@@ -281,7 +281,7 @@ static inline int ip_rcv_options(struct sk_buff *skb)
|
|
|
--ANK (980813)
|
|
|
*/
|
|
|
if (skb_cow(skb, skb_headroom(skb))) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);
|
|
|
goto drop;
|
|
|
}
|
|
|
|
|
@@ -290,7 +290,7 @@ static inline int ip_rcv_options(struct sk_buff *skb)
|
|
|
opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
|
|
|
|
|
|
if (ip_options_compile(dev_net(dev), opt, skb)) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INHDRERRORS);
|
|
|
goto drop;
|
|
|
}
|
|
|
|
|
@@ -334,9 +334,11 @@ static int ip_rcv_finish(struct sk_buff *skb)
|
|
|
skb->dev);
|
|
|
if (unlikely(err)) {
|
|
|
if (err == -EHOSTUNREACH)
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INADDRERRORS);
|
|
|
+ IP_INC_STATS_BH(dev_net(skb->dev),
|
|
|
+ IPSTATS_MIB_INADDRERRORS);
|
|
|
else if (err == -ENETUNREACH)
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INNOROUTES);
|
|
|
+ IP_INC_STATS_BH(dev_net(skb->dev),
|
|
|
+ IPSTATS_MIB_INNOROUTES);
|
|
|
goto drop;
|
|
|
}
|
|
|
}
|
|
@@ -357,9 +359,9 @@ static int ip_rcv_finish(struct sk_buff *skb)
|
|
|
|
|
|
rt = skb->rtable;
|
|
|
if (rt->rt_type == RTN_MULTICAST)
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INMCASTPKTS);
|
|
|
+ IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCASTPKTS);
|
|
|
else if (rt->rt_type == RTN_BROADCAST)
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INBCASTPKTS);
|
|
|
+ IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCASTPKTS);
|
|
|
|
|
|
return dst_input(skb);
|
|
|
|
|
@@ -382,10 +384,10 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
|
|
|
if (skb->pkt_type == PACKET_OTHERHOST)
|
|
|
goto drop;
|
|
|
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INRECEIVES);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INRECEIVES);
|
|
|
|
|
|
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -418,7 +420,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
|
|
|
|
|
|
len = ntohs(iph->tot_len);
|
|
|
if (skb->len < len) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INTRUNCATEDPKTS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INTRUNCATEDPKTS);
|
|
|
goto drop;
|
|
|
} else if (len < (iph->ihl*4))
|
|
|
goto inhdr_error;
|
|
@@ -428,7 +430,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
|
|
|
* Note this now means skb->len holds ntohs(iph->tot_len).
|
|
|
*/
|
|
|
if (pskb_trim_rcsum(skb, len)) {
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);
|
|
|
goto drop;
|
|
|
}
|
|
|
|
|
@@ -439,7 +441,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
|
|
|
ip_rcv_finish);
|
|
|
|
|
|
inhdr_error:
|
|
|
- IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
|
|
|
+ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INHDRERRORS);
|
|
|
drop:
|
|
|
kfree_skb(skb);
|
|
|
out:
|