Merge branch 'upstream-fixes' into upstream

f29cb26c · Jeff Garzik · 6d0c07cc · a24b163b · f29cb26c
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

drivers/net/pcnet32.c drivers/net/pcnet32.c +0 -2

未找到文件。
--- 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