|
@@ -1634,28 +1634,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * \brief Check Tx queue state for a given network buffer
|
|
|
- * @param lio per-network private data
|
|
|
- * @param skb network buffer
|
|
|
- */
|
|
|
-static inline int check_txq_state(struct lio *lio, struct sk_buff *skb)
|
|
|
-{
|
|
|
- int q, iq;
|
|
|
-
|
|
|
- q = skb->queue_mapping;
|
|
|
- iq = lio->linfo.txpciq[(q % lio->oct_dev->num_iqs)].s.q_no;
|
|
|
-
|
|
|
- if (octnet_iq_is_full(lio->oct_dev, iq))
|
|
|
- return 0;
|
|
|
-
|
|
|
- if (__netif_subqueue_stopped(lio->netdev, q)) {
|
|
|
- INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
|
|
|
- netif_wake_subqueue(lio->netdev, q);
|
|
|
- }
|
|
|
- return 1;
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* \brief Unmap and free network buffer
|
|
|
* @param buf buffer
|
|
@@ -1673,8 +1651,6 @@ static void free_netbuf(void *buf)
|
|
|
dma_unmap_single(&lio->oct_dev->pci_dev->dev, finfo->dptr, skb->len,
|
|
|
DMA_TO_DEVICE);
|
|
|
|
|
|
- check_txq_state(lio, skb);
|
|
|
-
|
|
|
tx_buffer_free(skb);
|
|
|
}
|
|
|
|
|
@@ -1715,8 +1691,6 @@ static void free_netsgbuf(void *buf)
|
|
|
list_add_tail(&g->list, &lio->glist[iq]);
|
|
|
spin_unlock(&lio->glist_lock[iq]);
|
|
|
|
|
|
- check_txq_state(lio, skb); /* mq support: sub-queue state check */
|
|
|
-
|
|
|
tx_buffer_free(skb);
|
|
|
}
|
|
|
|
|
@@ -1762,8 +1736,6 @@ static void free_netsgbuf_with_resp(void *buf)
|
|
|
spin_unlock(&lio->glist_lock[iq]);
|
|
|
|
|
|
/* Don't free the skb yet */
|
|
|
-
|
|
|
- check_txq_state(lio, skb);
|
|
|
}
|
|
|
|
|
|
/**
|