Skip to content

Commit

Permalink
mib: add net to IP_INC_STATS
Browse files Browse the repository at this point in the history 
All the callers already have either the net itself, or the place
where to get it from.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Jul 17, 2008
1 parent c6f8f7e commit 5e38e27
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion include/net/ip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ struct ipv4_config

extern struct ipv4_config ipv4_config;
DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics);
#define IP_INC_STATS(field) SNMP_INC_STATS(ip_statistics, field)
#define IP_INC_STATS(net, field) do { (void)net; SNMP_INC_STATS(ip_statistics, field); } while (0)
#define IP_INC_STATS_BH(field) SNMP_INC_STATS_BH(ip_statistics, field)
#define IP_ADD_STATS_BH(field, val) SNMP_ADD_STATS_BH(ip_statistics, field, val)
DECLARE_SNMP_STAT(struct linux_mib, net_statistics);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/ip_forward.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int ip_forward(struct sk_buff *skb)

if (unlikely(skb->len > dst_mtu(&rt->u.dst) && !skb_is_gso(skb) &&
(ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) {
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
IP_INC_STATS(dev_net(rt->u.dst.dev), IPSTATS_MIB_FRAGFAILS);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(dst_mtu(&rt->u.dst)));
goto drop;
Expand Down
30 changes: 15 additions & 15 deletions net/ipv4/ip_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ static inline int ip_finish_output2(struct sk_buff *skb)
unsigned int hh_len = LL_RESERVED_SPACE(dev);

if (rt->rt_type == RTN_MULTICAST)
IP_INC_STATS(IPSTATS_MIB_OUTMCASTPKTS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTMCASTPKTS);
else if (rt->rt_type == RTN_BROADCAST)
IP_INC_STATS(IPSTATS_MIB_OUTBCASTPKTS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTBCASTPKTS);

/* Be paranoid, rather than too clever. */
if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
Expand Down Expand Up @@ -244,7 +244,7 @@ int ip_mc_output(struct sk_buff *skb)
/*
* If the indicated interface is up and running, send the packet.
*/
IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);

skb->dev = dev;
skb->protocol = htons(ETH_P_IP);
Expand Down Expand Up @@ -298,7 +298,7 @@ int ip_output(struct sk_buff *skb)
{
struct net_device *dev = skb->dst->dev;

IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);

skb->dev = dev;
skb->protocol = htons(ETH_P_IP);
Expand Down Expand Up @@ -389,7 +389,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
return ip_local_out(skb);

no_route:
IP_INC_STATS(IPSTATS_MIB_OUTNOROUTES);
IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
kfree_skb(skb);
return -EHOSTUNREACH;
}
Expand Down Expand Up @@ -451,7 +451,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
iph = ip_hdr(skb);

if (unlikely((iph->frag_off & htons(IP_DF)) && !skb->local_df)) {
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(ip_skb_dst_mtu(skb)));
kfree_skb(skb);
Expand Down Expand Up @@ -542,7 +542,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
err = output(skb);

if (!err)
IP_INC_STATS(IPSTATS_MIB_FRAGCREATES);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
if (err || !frag)
break;

Expand All @@ -552,7 +552,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
}

if (err == 0) {
IP_INC_STATS(IPSTATS_MIB_FRAGOKS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGOKS);
return 0;
}

Expand All @@ -561,7 +561,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
kfree_skb(frag);
frag = skb;
}
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
return err;
}

Expand Down Expand Up @@ -673,15 +673,15 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
if (err)
goto fail;

IP_INC_STATS(IPSTATS_MIB_FRAGCREATES);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
}
kfree_skb(skb);
IP_INC_STATS(IPSTATS_MIB_FRAGOKS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGOKS);
return err;

fail:
kfree_skb(skb);
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
return err;
}

Expand Down Expand Up @@ -1047,7 +1047,7 @@ int ip_append_data(struct sock *sk,

error:
inet->cork.length -= length;
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);
return err;
}

Expand Down Expand Up @@ -1189,7 +1189,7 @@ ssize_t ip_append_page(struct sock *sk, struct page *page,

error:
inet->cork.length -= size;
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);
return err;
}

Expand Down Expand Up @@ -1298,7 +1298,7 @@ int ip_push_pending_frames(struct sock *sk)
return err;

error:
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
goto out;
}

Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/raw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
err = -EFAULT;
kfree_skb(skb);
error:
IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
return err;
}

Expand Down

0 comments on commit 5e38e27

Please sign in to comment.