diff --git a/[refs] b/[refs] index e0db85b63d5f..4a86ab222c30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b711b2e0fa6589f22ba53464bc1b49e4702eda5b +refs/heads/master: 63841ad24775f1ac83c134b1e44d51fe19afbbb6 diff --git a/trunk/drivers/staging/et131x/et131x_netdev.c b/trunk/drivers/staging/et131x/et131x_netdev.c index 93dbed47c2e8..7c55f5d52d5c 100644 --- a/trunk/drivers/staging/et131x/et131x_netdev.c +++ b/trunk/drivers/staging/et131x/et131x_netdev.c @@ -547,15 +547,6 @@ void et131x_tx_timeout(struct net_device *netdev) tcb->Count++; if (tcb->Count > NIC_SEND_HANG_THRESHOLD) { - struct tx_desc stuck[10]; - - if (INDEX10(tcb->WrIndex) > 7) { - memcpy(stuck, - etdev->tx_ring.tx_desc_ring + - INDEX10(tcb->WrIndex) - 6, - sizeof(struct tx_desc) * 10); - } - spin_unlock_irqrestore(&etdev->TCBSendQLock, flags);