diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:16:05 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:16:05 -0400 |
commit | 3b85418bc998876ce46784fb49f243100b2dd909 (patch) | |
tree | 0e03bc4867f442902f09c6c2951f90983f1bdb45 /drivers/net | |
parent | 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (diff) | |
parent | bcb49197ed9a2e8a0a8d990723dccfccffa7566f (diff) | |
download | op-kernel-dev-3b85418bc998876ce46784fb49f243100b2dd909.zip op-kernel-dev-3b85418bc998876ce46784fb49f243100b2dd909.tar.gz |
Merge branch 'skb_truesize' of git://lost.foo-projects.org/~ahkok/git/linux-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index add8dc4..c99e878 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -3768,6 +3768,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, ps_page->ps_page[j] = NULL; skb->len += length; skb->data_len += length; + skb->truesize += length; } copydone: |