| Message ID | 1229539981-14041-2-git-send-email-afleming@freescale.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Andy Fleming <afleming@freescale.com> Date: Wed, 17 Dec 2008 12:52:57 -0600 > We don't want to unmap the skb if we've decided to use the old one, so we only > unmap it if we're *not* using the old one. > > Signed-off-by: Andy Fleming <afleming@freescale.com> Andy.... look at what you're doing here. Your patch talks about DMA mapping, yet the patch deals with protecting an SKB free call. Your commit message matches the original patch but not this one. In fact I fear that, in fact, there was a bug being fixed originally, and in fact you do need to modify where the DMA unmap occurs in this function, but in fixing up the patch to apply you've not gotten that part straight. I'm tossing these patches again. If the commit message can't even match what the patch is doing, you need to take a good long look at these changes and then resubmit them with accurate commit messages. Thanks. -- 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
On Dec 17, 2008, at 2:22 PM, David Miller wrote: > From: Andy Fleming <afleming@freescale.com> > Date: Wed, 17 Dec 2008 12:52:57 -0600 > >> We don't want to unmap the skb if we've decided to use the old one, >> so we only >> unmap it if we're *not* using the old one. >> >> Signed-off-by: Andy Fleming <afleming@freescale.com> > > Andy.... look at what you're doing here. Your patch talks about DMA > mapping, yet the patch deals with protecting an SKB free call. > > Your commit message matches the original patch but not this one. > > In fact I fear that, in fact, there was a bug being fixed originally, > and in fact you do need to modify where the DMA unmap occurs in this > function, but in fixing up the patch to apply you've not gotten that > part straight. > > I'm tossing these patches again. If the commit message can't even > match what the patch is doing, you need to take a good long look at > these changes and then resubmit them with accurate commit messages. Argh, I apologize. The patch still does the same thing, but the dma_unmap got moved up. The commit message got hastily composed when I had to reapply the patch on an older tree, and I forgot to change it when I fixed it. I will review and make sure I haven't made more such mistakes. Andy -- 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
From: Andy Fleming <afleming@freescale.com> Date: Wed, 17 Dec 2008 15:41:09 -0600 > I will review and make sure I haven't made more such mistakes. Thanks a lot Andy. -- 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/gianfar.c b/drivers/net/gianfar.c index 3e611a6..a6efabc 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1732,8 +1732,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit) if (unlikely(!newskb)) newskb = skb; - - if (skb) + else if (skb) dev_kfree_skb_any(skb); } else { /* Increment the number of packets */
We don't want to unmap the skb if we've decided to use the old one, so we only unmap it if we're *not* using the old one. Signed-off-by: Andy Fleming <afleming@freescale.com> --- drivers/net/gianfar.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)