diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2015-03-25 23:41:33 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-29 22:06:45 +0300 |
| commit | 7a1e890e2168e33fb62d84528e996b8b4b478fea (patch) | |
| tree | 2b9d47228b9d613a9934f8bddde26a6633cf748e /drivers/net/usb/asix_common.c | |
| parent | 1e9e39f4a29857a396ac7b669d109f697f66695e (diff) | |
| download | linux-7a1e890e2168e33fb62d84528e996b8b4b478fea.tar.xz | |
usbnet: Fix tx_bytes statistic running backward in cdc_ncm
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>
Diffstat (limited to 'drivers/net/usb/asix_common.c')
| -rw-r--r-- | drivers/net/usb/asix_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c index 724a9b50df7a..75d6f26729a3 100644 --- a/drivers/net/usb/asix_common.c +++ b/drivers/net/usb/asix_common.c @@ -189,7 +189,7 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, skb_put(skb, sizeof(padbytes)); } - usbnet_set_skb_tx_stats(skb, 1); + usbnet_set_skb_tx_stats(skb, 1, 0); return skb; } |