git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
usb
/
cdc_ncm.c
diff --git
a/drivers/net/usb/cdc_ncm.c
b/drivers/net/usb/cdc_ncm.c
index c3e4da9e79ca071a06082e965a3aec5bb206a77e..8067b8fbb0eea42b106cc56ffe6bc216ae01f85a 100644
(file)
--- 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;