usbnet: Fix tx_bytes statistic running backward in cdc_ncm
authorBen Hutchings <ben.hutchings@codethink.co.uk>
Wed, 25 Mar 2015 20:41:33 +0000 (21:41 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 27 Apr 2015 21:13:42 +0000 (17:13 -0400)
commite083cde25c210e1960a3fbfe71c9ada4f9148a26
tree65f27b5c4c833c20aceb4baa976978a18580c8c2
parentd0f6e5cf80894ada0f9143be5e4a0d24a803c3f0
usbnet: Fix tx_bytes statistic running backward in cdc_ncm

[ Upstream commit 7a1e890e2168e33fb62d84528e996b8b4b478fea ]

cdc_ncm disagrees with usbnet about how much framing overhead should
be counted in the tx_bytes statistics, and tries 'fix' this by
decrementing tx_bytes on the transmit path.  But statistics must never
be decremented except due to roll-over; this will thoroughly confuse
user-space.  Also, tx_bytes is only incremented by usbnet in the
completion path.

Fix this by requiring drivers that set FLAG_MULTI_FRAME to set a
tx_bytes delta along with the tx_packets count.

Fixes: beeecd42c3b4 ("net: cdc_ncm/cdc_mbim: adding NCM protocol statistics")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/net/usb/asix_common.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/sr9800.c
drivers/net/usb/usbnet.c
include/linux/usb/usbnet.h