[PATCH] e1000: skb truesize fix

[PATCH] e1000: skb truesize fix

[Kok, Auke]

Hi,

This patch was already merged in Jeff Garzik's netdev upstream branch but
needs to go into 12.6.16.y and 2.6.17rc* as it fixes a critical buffersize
skb bug that is exposed by an earlier patch by Dave Miller and Herbert
Xiu. I'm therefore resending it:

Please apply to 2.6.16.y and queue for 2.6.17-rc.

These changes are available through git. Jeff, please pull from:

git://lost.foo-projects.org/~ahkok/git/linux-2.6 skb_truesize

these patches are against
 linux-2.6.git#master 4d5c34ec7b007cfb0771a36996b009f194acbb2f


Cheers,

Auke Kok


---
 drivers/net/e1000/e1000_main.c |    1 +
 1 files changed, 1 insertion(+)


--
Auke Kok <auke-jan.h.kok@intel.com>
Intel Pro(R) Ethernet Driver Group
LAN Access Division / Digital Enterprise Group 

[PATCH] e1000: Update truesize with the length of the packet for packet split

[Kok, Auke]

Update skb with the real packet size.


Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
---

 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_adapt
 			ps_page->ps_page[j] = NULL;
 			skb->len += length;
 			skb->data_len += length;
+			skb->truesize += length;
 		}
 
 copydone:



--
Auke Kok <auke-jan.h.kok@intel.com>
Intel Pro(R) Ethernet Driver Group
LAN Access Division / Digital Enterprise Group 

Re: [PATCH] e1000: skb truesize fix

[David S. Miller]

From: "Kok, Auke" <auke-jan.h.kok@intel.com>
Date: Tue, 25 Apr 2006 23:12:30 -0700

> This patch was already merged in Jeff Garzik's netdev upstream branch but
> needs to go into 12.6.16.y and 2.6.17rc* as it fixes a critical buffersize
> skb bug that is exposed by an earlier patch by Dave Miller and Herbert
> Xiu. I'm therefore resending it:
> 
> Please apply to 2.6.16.y and queue for 2.6.17-rc.
> 
> These changes are available through git. Jeff, please pull from:
> 
> git://lost.foo-projects.org/~ahkok/git/linux-2.6 skb_truesize
> 
> these patches are against
>  linux-2.6.git#master 4d5c34ec7b007cfb0771a36996b009f194acbb2f

ACK on the -stable submission.  Jeff can take care of 2.6.17-x

Re: [PATCH] e1000: skb truesize fix

[Jeff Garzik]

Kok, Auke wrote:
> Hi,
> 
> This patch was already merged in Jeff Garzik's netdev upstream branch but
> needs to go into 12.6.16.y and 2.6.17rc* as it fixes a critical buffersize
> skb bug that is exposed by an earlier patch by Dave Miller and Herbert
> Xiu. I'm therefore resending it:
> 
> Please apply to 2.6.16.y and queue for 2.6.17-rc.
> 
> These changes are available through git. Jeff, please pull from:
> 
> git://lost.foo-projects.org/~ahkok/git/linux-2.6 skb_truesize

pulled, queued for 2.6.17-rc

Re: [stable] [PATCH] e1000: Update truesize with the length of the packet for packet split

[Greg KH]

On Tue, Apr 25, 2006 at 11:16:29PM -0700, Kok, Auke wrote:
> 
> Update skb with the real packet size.
> 
> 
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Signed-off-by: John Ronciak <john.ronciak@intel.com>

queued to -stable.

thanks,

greg k-h