Merge branch 'upstream-fixes' into upstream
This commit is contained in:
commit
f29cb26c43
|
@ -1774,8 +1774,6 @@ static int pcnet32_open(struct net_device *dev)
|
||||||
lp->rx_dma_addr[i] = 0;
|
lp->rx_dma_addr[i] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pcnet32_free_ring(dev);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Switch back to 16bit mode to avoid problems with dumb
|
* Switch back to 16bit mode to avoid problems with dumb
|
||||||
* DOS packet driver after a warm reboot
|
* DOS packet driver after a warm reboot
|
||||||
|
|
Loading…
Reference in New Issue