| Message ID | 200809242116.40855.florian@openwrt.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | Jeff Garzik |
| Headers | show |
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 <florian@openwrt.org> > 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 <florian@openwrt.org> > --- > 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 -- 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/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; }