diff options
| author | Vincent Bernat <bernat@luffy.cx> | 2012-06-05 03:41:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-07 14:50:56 -0700 |
| commit | 2d8dbb04c63e5369988f008bc4df3359c01d8812 (patch) | |
| tree | b86550058254c26ad43065522e70712b73714c3d /net/ipv6/ip6mr.c | |
| parent | 278f015e9b67566991d4e831fe38e0ebbeef245e (diff) | |
| download | linux-3.10-2d8dbb04c63e5369988f008bc4df3359c01d8812.tar.gz linux-3.10-2d8dbb04c63e5369988f008bc4df3359c01d8812.tar.bz2 linux-3.10-2d8dbb04c63e5369988f008bc4df3359c01d8812.zip | |
snmp: fix OutOctets counter to include forwarded datagrams
RFC 4293 defines ipIfStatsOutOctets (similar definition for
ipSystemStatsOutOctets):
The total number of octets in IP datagrams delivered to the lower
layers for transmission. Octets from datagrams counted in
ipIfStatsOutTransmits MUST be counted here.
And ipIfStatsOutTransmits:
The total number of IP datagrams that this entity supplied to the
lower layers for transmission. This includes datagrams generated
locally and those forwarded by this entity.
Therefore, IPSTATS_MIB_OUTOCTETS must be incremented when incrementing
IPSTATS_MIB_OUTFORWDATAGRAMS.
IP_UPD_PO_STATS is not used since ipIfStatsOutRequests must not
include forwarded datagrams:
The total number of IP datagrams that local IP user-protocols
(including ICMP) supplied to IP in requests for transmission. Note
that this counter does not include any datagrams counted in
ipIfStatsOutForwDatagrams.
Signed-off-by: Vincent Bernat <bernat@luffy.cx>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index b15dc08643a..461e47c8e95 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1886,6 +1886,8 @@ static inline int ip6mr_forward2_finish(struct sk_buff *skb) { IP6_INC_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUTFORWDATAGRAMS); + IP6_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)), + IPSTATS_MIB_OUTOCTETS, skb->len); return dst_output(skb); } |