diff options
| author | Willem de Bruijn <willemb@google.com> | 2013-08-19 22:40:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-21 02:23:58 +0200 |
| commit | 8bcdeaff5ed544704a9a691d4aef0adb3f9c5b8f (patch) | |
| tree | a100df027287cf5e047dd8f9c651673afc8b6434 | |
| parent | net: phy: rtl8211: fix interrupt on status link change (diff) | |
| download | linux-8bcdeaff5ed544704a9a691d4aef0adb3f9c5b8f.tar.xz linux-8bcdeaff5ed544704a9a691d4aef0adb3f9c5b8f.zip | |
packet: restore packet statistics tp_packets to include drops
getsockopt PACKET_STATISTICS returns tp_packets + tp_drops. Commit
ee80fbf301 ("packet: account statistics only in tpacket_stats_u")
cleaned up the getsockopt PACKET_STATISTICS code.
This also changed semantics. Historically, tp_packets included
tp_drops on return. The commit removed the line that adds tp_drops
into tp_packets.
This patch reinstates the old semantics.
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 4b66c752eae5..75c8bbf598c8 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3259,9 +3259,11 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, if (po->tp_version == TPACKET_V3) { lv = sizeof(struct tpacket_stats_v3); + st.stats3.tp_packets += st.stats3.tp_drops; data = &st.stats3; } else { lv = sizeof(struct tpacket_stats); + st.stats1.tp_packets += st.stats1.tp_drops; data = &st.stats1; } |