Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Francois Romieu
Date: Tuesday, January 8, 2008 - 2:36 pm

linux@horizon.com <linux@horizon.com> :

Can you try the patch below ?

diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dbd23bb..c304e5c 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -860,7 +860,7 @@ static void ipg_nic_txfree(struct net_device *dev)
 	void __iomem *ioaddr = sp->ioaddr;
 	unsigned int curr;
 	u64 txd_map;
-	unsigned int released, pending;
+	unsigned int released, pending, dirty;
 
 	txd_map = (u64)sp->txd_map;
 	curr = ipg_r32(TFD_LIST_PTR_0) -
@@ -869,9 +869,9 @@ static void ipg_nic_txfree(struct net_device *dev)
 	IPG_DEBUG_MSG("_nic_txfree\n");
 
 	pending = sp->tx_current - sp->tx_dirty;
+	dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
 
 	for (released = 0; released < pending; released++) {
-		unsigned int dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
 		struct sk_buff *skb = sp->TxBuff[dirty];
 		struct ipg_tx *txfd = sp->txd + dirty;
 
@@ -898,6 +898,7 @@ static void ipg_nic_txfree(struct net_device *dev)
 
 			sp->TxBuff[dirty] = NULL;
 		}
+		dirty = (dirty + 1) % IPG_TFDLIST_LENGTH;
 	}
 
 	sp->tx_dirty += released;
-- 
1.5.3.3

--
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: 2.6.23-rc8 network problem. Mem leak? ip1000a?, Andrew Morton, (Fri Sep 28, 2:20 am)
Re: 2.6.23-rc8 network problem. Mem leak? ip1000a?, Andrew Morton, (Sun Sep 30, 2:23 am)
Re: 2.6.23-rc8 network problem. Mem leak? ip1000a?, David Miller, (Tue Jan 8, 12:07 am)
Re: 2.6.23-rc8 network problem. Mem leak? ip1000a?, David Miller, (Tue Jan 8, 12:14 am)
Re: 2.6.23-rc8 network problem. Mem leak? ip1000a?, Francois Romieu, (Tue Jan 8, 12:51 am)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, Francois Romieu, (Tue Jan 8, 2:36 pm)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, David Miller, (Tue Jan 8, 4:00 pm)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, Francois Romieu, (Tue Jan 8, 4:28 pm)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, David Miller, (Wed Jan 9, 1:39 am)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, Francois Romieu, (Wed Jan 9, 4:30 pm)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, Francois Romieu, (Wed Jan 9, 4:34 pm)
Re: [PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak, David Miller, (Wed Jan 9, 4:56 pm)
ipg.c bugs, linux, (Thu Jan 10, 12:28 am)