diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /net/packet | |
| parent | Merge branch 'cadence' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-b05930f5d1c7d5873cb050261d21789a99de9d48.tar.xz linux-dev-b05930f5d1c7d5873cb050261d21789a99de9d48.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h
The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.
The iwlwifi conflict is a context overlap.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -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 6c53dd9f5ccc..1fdf9ab91c3f 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3215,9 +3215,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; } |