On Mon, Aug 07, 2006 at 05:29:54PM -0700, Jesse Brandeburg wrote: > On 8/7/06, David Miller <[EMAIL PROTECTED]> wrote: > >From: Christoph Hellwig <[EMAIL PROTECTED]> > >Date: Sat, 5 Aug 2006 15:01:09 +0200 > > > >> All caller of netdev_alloc_skb need to assign skb->dev shortly > >> afterwards. Move it into common code. > >> > >> I also had to fixup a little bit of the surrounding control flow in > >> e1000 - it was just too convoluted. > >> > >> Signed-off-by: Christoph Hellwig <[EMAIL PROTECTED]> > > > >Since the e1000 change is non-trivial I'm not going to bypass > >the driver author on it, sorry. > > > >What I did do was put the netdev_alloc_skb() change into my > >tree, and since I'm co-author of the tg3 driver I'll apply > >that bit too. > > > >The e1000 bit will need to go through the e1000 maintainers. > > Thank you, I'll take a look at this tomorrow, as I need to digest the > patch in context.
Did you get a chance to look at it? For your conveniance here's just the e1000 bits, without the hunks Dave has commited already: Index: linux-2.6/drivers/net/e1000/e1000_main.c =================================================================== --- linux-2.6.orig/drivers/net/e1000/e1000_main.c 2006-08-04 19:06:09.000000000 +0200 +++ linux-2.6/drivers/net/e1000/e1000_main.c 2006-08-05 14:18:32.000000000 +0200 @@ -3711,7 +3711,6 @@ netdev_alloc_skb(netdev, length + NET_IP_ALIGN); if (new_skb) { skb_reserve(new_skb, NET_IP_ALIGN); - new_skb->dev = netdev; memcpy(new_skb->data - NET_IP_ALIGN, skb->data - NET_IP_ALIGN, length + NET_IP_ALIGN); @@ -3978,13 +3977,13 @@ buffer_info = &rx_ring->buffer_info[i]; while (cleaned_count--) { - if (!(skb = buffer_info->skb)) - skb = netdev_alloc_skb(netdev, bufsz); - else { + skb = buffer_info->skb; + if (skb) { skb_trim(skb, 0); goto map_skb; } + skb = netdev_alloc_skb(netdev, bufsz); if (unlikely(!skb)) { /* Better luck next round */ adapter->alloc_rx_buff_failed++; @@ -4009,10 +4008,10 @@ dev_kfree_skb(skb); dev_kfree_skb(oldskb); break; /* while !buffer_info->skb */ - } else { - /* Use new allocation */ - dev_kfree_skb(oldskb); } + + /* Use new allocation */ + dev_kfree_skb(oldskb); } /* Make buffer alignment 2 beyond a 16 byte boundary * this will result in a 16 byte aligned IP header after @@ -4020,8 +4019,6 @@ */ skb_reserve(skb, NET_IP_ALIGN); - skb->dev = netdev; - buffer_info->skb = skb; buffer_info->length = adapter->rx_buffer_len; map_skb: @@ -4135,8 +4132,6 @@ */ skb_reserve(skb, NET_IP_ALIGN); - skb->dev = netdev; - buffer_info->skb = skb; buffer_info->length = adapter->rx_ps_bsize0; buffer_info->dma = pci_map_single(pdev, skb->data, - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html