Message ID | 20090312043954.GA7132@redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Dave Jones a écrit : > On Wed, Mar 11, 2009 at 09:20:09PM -0700, David Miller wrote: > > From: David Miller <davem@davemloft.net> > > Date: Wed, 11 Mar 2009 21:17:06 -0700 (PDT) > > > > > > > > velocity_xmit() needs to set 'pktlen = skb->len;' after, > > > not before, the skb_padto() call. > > > > Actually that won't work since, as you suggest, skb->len > > isn't updated by skb_padto(). > > > > So the transmit needs something like: > > > > pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); > > > > velocity_free_tx_buf() needs to make the same calculation > > instead of just plain skb->len > > Something like this ? > (It looks like the ZERO_COPY_SUPPORT is never enabled anywhere, > so I didn't dig into how that works). > > diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c > index c5691fd..cd34dda 100644 > --- a/drivers/net/via-velocity.c > +++ b/drivers/net/via-velocity.c > @@ -1838,6 +1838,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_ > { > struct sk_buff *skb = tdinfo->skb; > int i; > + int pktlen; > > /* > * Don't unmap the pre-allocated tx_bufs > @@ -1845,10 +1846,11 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_ > if (tdinfo->skb_dma) { > > + pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); I personally find better to use max(skb->len, ETH_ZLEN) macro, but YMMV ;) It actually can avoid you a bug ;) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index c5691fd..cd34dda 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1838,6 +1838,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_ { struct sk_buff *skb = tdinfo->skb; int i; + int pktlen; /* * Don't unmap the pre-allocated tx_bufs @@ -1845,10 +1846,11 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_ if (tdinfo->skb_dma) { + pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); for (i = 0; i < tdinfo->nskb_dma; i++) { #ifdef VELOCITY_ZERO_COPY_SUPPORT pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE); #else - pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], skb->len, PCI_DMA_TODEVICE); + pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], pktlen, PCI_DMA_TODEVICE); #endif tdinfo->skb_dma[i] = 0; } @@ -2080,17 +2083,14 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev) struct tx_desc *td_ptr; struct velocity_td_info *tdinfo; unsigned long flags; - int pktlen = skb->len; + int pktlen; __le16 len; int index; - - if (skb->len < ETH_ZLEN) { - if (skb_padto(skb, ETH_ZLEN)) - goto out; - pktlen = ETH_ZLEN; - } + if (skb_padto(skb, ETH_ZLEN)) + goto out; + pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); len = cpu_to_le16(pktlen);