diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
| commit | 4ed4d44eb2192604716226a6f0edad02ab76101f (patch) | |
| tree | 74c2a4041e46b906d89c5880b9cdeb5d768827c4 /net/packet/af_packet.c | |
| parent | cb03293a043ab9bda850fe143062bd304a9e2376 (diff) | |
| parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) | |
Merge tag 'v3.10.12' into linux-linaro-lsklsk-13.09
This is the 3.10.12 stable release
Diffstat (limited to 'net/packet/af_packet.c')
| -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 20a1bd0e654..a6895ab597c 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; } |