Re: oops with e1000, ifenslave (bonding)

[Marc-Christian Petersen]

--Boundary-00=_0z9m+DO6NT4BhFL
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Tuesday 15 April 2003 12:10, Peter wrote:

Hi Peter,

> Hello,
> the following oops occurs repeatadly:
Does the attached patch fixes the problem?

Patch by: Scott Feldman <scott.feldman <located at> intel.com>

ciao, Marc
--Boundary-00=_0z9m+DO6NT4BhFL
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="e1000-bonding-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="e1000-bonding-fix.patch"

--- linux-2.4.20/drivers/net/e1000/e1000_main.c.orig	2003-03-11 13:45:26.000000000 -0800
+++ linux-2.4.20/drivers/net/e1000/e1000_main.c	2003-03-11 14:12:12.000000000 -0800
@@ -963,6 +963,9 @@
 	unsigned long size;
 	int i;
 
+	if(!adapter->tx_ring.buffer_info)
+		return;
+
 	/* Free all the Tx ring sk_buffs */
 
 	for(i = 0; i < adapter->tx_ring.count; i++) {
@@ -1028,6 +1031,9 @@
 	unsigned long size;
 	int i;
 
+	if(!adapter->rx_ring.buffer_info)
+		return;
+
 	/* Free all the Rx ring sk_buffs */
 
 	for(i = 0; i < adapter->rx_ring.count; i++) {

--Boundary-00=_0z9m+DO6NT4BhFL--