From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] r6040: fix wrong assignment in r6040_free_txbufs Date: Wed, 24 Sep 2008 20:52:01 -0400 Message-ID: <48DAE0B1.4000706@garzik.org> References: <200809242116.40855.florian@openwrt.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Francois Romieu , netdev@vger.kernel.org To: Florian Fainelli Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:47079 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819AbYIYAwJ (ORCPT ); Wed, 24 Sep 2008 20:52:09 -0400 In-Reply-To: <200809242116.40855.florian@openwrt.org> Sender: netdev-owner@vger.kernel.org List-ID: Florian Fainelli wrote: > Hello Jeff, Francois, > > This is 2.6.27 material but should be applied to your -next branch as well. Thank you. > -- > From: Florian Fainelli > Subject: [PATCH] r6040: fix wrong assignment in r6040_free_txbufs > > This patch fixes a wrong assignment in r6040_free_txbufs > on a receive skb pointer while we should actually do this > on the transmit skb pointer. > > Signed-off-by: Florian Fainelli > --- > diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c > index 396f0e4..5aff7c8 100644 > --- a/drivers/net/r6040.c > +++ b/drivers/net/r6040.c > @@ -261,7 +261,7 @@ static void r6040_free_txbufs(struct net_device *dev) > le32_to_cpu(lp->tx_insert_ptr->buf), > MAX_BUF_SIZE, PCI_DMA_TODEVICE); > dev_kfree_skb(lp->tx_insert_ptr->skb_ptr); > - lp->rx_insert_ptr->skb_ptr = NULL; > + lp->tx_insert_ptr->skb_ptr = NULL; > } > lp->tx_insert_ptr = lp->tx_insert_ptr->vndescp; > } applied