Merge branch 'upstream-fixes' into upstream

git-mirror · May 27, 2006 · f29cb26 · f29cb26
2 parents 6d0c07c + a24b163
commit f29cb26
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
@@ -1774,8 +1774,6 @@ static int pcnet32_open(struct net_device *dev)
 		lp->rx_dma_addr[i] = 0;
 	}
 
-	pcnet32_free_ring(dev);
-
 	/*
 	 * Switch back to 16bit mode to avoid problems with dumb
 	 * DOS packet driver after a warm reboot