|
@@ -857,21 +857,14 @@ static void init_tfdlist(struct net_device *dev)
|
|
|
static void ipg_nic_txfree(struct net_device *dev)
|
|
|
{
|
|
|
struct ipg_nic_private *sp = netdev_priv(dev);
|
|
|
- void __iomem *ioaddr = sp->ioaddr;
|
|
|
- unsigned int curr;
|
|
|
- u64 txd_map;
|
|
|
- unsigned int released, pending;
|
|
|
-
|
|
|
- txd_map = (u64)sp->txd_map;
|
|
|
- curr = ipg_r32(TFD_LIST_PTR_0) -
|
|
|
- do_div(txd_map, sizeof(struct ipg_tx)) - 1;
|
|
|
+ unsigned int released, pending, dirty;
|
|
|
|
|
|
IPG_DEBUG_MSG("_nic_txfree\n");
|
|
|
|
|
|
pending = sp->tx_current - sp->tx_dirty;
|
|
|
+ dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
|
|
|
|
|
|
for (released = 0; released < pending; released++) {
|
|
|
- unsigned int dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
|
|
|
struct sk_buff *skb = sp->TxBuff[dirty];
|
|
|
struct ipg_tx *txfd = sp->txd + dirty;
|
|
|
|
|
@@ -882,11 +875,8 @@ static void ipg_nic_txfree(struct net_device *dev)
|
|
|
* If the TFDDone bit is set, free the associated
|
|
|
* buffer.
|
|
|
*/
|
|
|
- if (dirty == curr)
|
|
|
- break;
|
|
|
-
|
|
|
- /* Setup TFDDONE for compatible issue. */
|
|
|
- txfd->tfc |= cpu_to_le64(IPG_TFC_TFDDONE);
|
|
|
+ if (!(txfd->tfc & cpu_to_le64(IPG_TFC_TFDDONE)))
|
|
|
+ break;
|
|
|
|
|
|
/* Free the transmit buffer. */
|
|
|
if (skb) {
|
|
@@ -898,6 +888,7 @@ static void ipg_nic_txfree(struct net_device *dev)
|
|
|
|
|
|
sp->TxBuff[dirty] = NULL;
|
|
|
}
|
|
|
+ dirty = (dirty + 1) % IPG_TFDLIST_LENGTH;
|
|
|
}
|
|
|
|
|
|
sp->tx_dirty += released;
|