diff options
| author | Bjørn Mork <bjorn@mork.no> | 2015-05-22 13:15:22 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-06-02 13:03:18 +0100 |
| commit | 7baba68a6a6496570797a6af2cd669f0a5a4f1c7 (patch) | |
| tree | ecc1b93b680f615ba8fdf80964ce553db116b462 | |
| parent | 9ccba705cdee52b3bfe802d3d10093bae7fe5022 (diff) | |
| download | linux-stable-7baba68a6a6496570797a6af2cd669f0a5a4f1c7.tar.gz linux-stable-7baba68a6a6496570797a6af2cd669f0a5a4f1c7.tar.bz2 linux-stable-7baba68a6a6496570797a6af2cd669f0a5a4f1c7.zip | |
cdc_ncm: Fix tx_bytes statistics
commit 44f6731d8b68fa02f5ed65eaceac41f8c3c9279e upstream.
The tx_curr_frame_payload field is u32. When we try to calculate a
small negative delta based on it, we end up with a positive integer
close to 2^32 instead. So the tx_bytes pointer increases by about
2^32 for every transmitted frame.
Fix by calculating the delta as a signed long.
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Reported-by: Florian Bruhin <me@the-compiler.org>
Fixes: 7a1e890e2168 ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/net/usb/cdc_ncm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index c3e4da9e79ca..8067b8fbb0ee 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1182,7 +1182,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) * payload data instead. */ usbnet_set_skb_tx_stats(skb_out, n, - ctx->tx_curr_frame_payload - skb_out->len); + (long)ctx->tx_curr_frame_payload - skb_out->len); return skb_out; |