Skip to contentSkip to conversation

e1000: skb truesize fix

PATCH In review Kok, Auke 4 participants 5 messages Apr 26, 2006 – Apr 27, 2006

Subsystems (2)
lore
Share & tools
lore

Kok, Auke

author
#0 lore raw

PATCH 1/1 e1000: skb truesize fix

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 <[email protected]>
Intel Pro(R) Ethernet Driver Group
LAN Access Division / Digital Enterprise Group

author
#1 lore raw

PATCH 1/1 e1000: Update truesize with the length of the packet for packet split

Update skb with the real packet size.

---

 drivers/net/e1000/e1000_main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/e1000/e1000_main.c +1 -0
index add8dc4..c99e878 100644
@@ -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 <[email protected]>
Intel Pro(R) Ethernet Driver Group
LAN Access Division / Digital Enterprise Group

maintainer
#3 lore raw
In reply to Kok, Auke

From: "Kok, Auke" <[email protected]>
Date: Tue, 25 Apr 2006 23:12:30 -0700

Quoted 5 lines

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:

Quoted 8 lines

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

#4 lore raw
In reply to Kok, Auke
Quoted 7 lines · 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:

Quoted 5 lines

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