--- drivers/net/ucc_geth.c

+++ drivers/net/ucc_geth.c

@@ -1563,7 +1563,10 @@ static int ugeth_disable(struct ucc_geth

static void ugeth_quiesce(struct ucc_geth_private *ugeth)

{

- /* Wait for and prevent any further xmits. */

+ /* Prevent any further xmits, plus detach the device. */

+ netif_device_detach(ugeth->ndev);

+

+ /* Wait for any current xmits to finish. */

netif_tx_disable(ugeth->ndev);

/* Disable the interrupt to avoid NAPI rescheduling. */

@@ -1577,7 +1580,7 @@ static void ugeth_activate(struct ucc_ge

{

napi_enable(&ugeth->napi);

enable_irq(ugeth->ug_info->uf_info.irq);

- netif_tx_wake_all_queues(ugeth->ndev);

+ netif_device_attach(ugeth->ndev);

}

/* Called every time the controller might need to be made

@@ -3273,13 +3276,12 @@ static int ucc_geth_tx(struct net_device

/* Handle the transmitted buffer and release */

/* the BD to be used with the current frame */

- if ((bd == ugeth->txBd[txQ]) && (netif_queue_stopped(dev) == 0))

+ skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];

+ if (!skb)

break;

dev->stats.tx_packets++;

- skb = ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]];

-

if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN &&

skb_recycle_check(skb,

ugeth->ug_info->uf_info.max_rx_buf_length +