d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The POLL code was missed in the queue conversion,

Browse Source 
change the argument type to igb_rxeof() to the
correct type. Note, any users of POLLING must
be sure and set the number of queues to 1 for
things to work correctly.
This commit is contained in:
jfv 2010-03-31 23:24:42 +00:00
parent 69ea0c9b4e
commit c470b0d21d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/e1000/if_igb.c
View File

@ -1316,7 +1316,8 @@ igb_irq_fast(void *arg)
#ifdef DEVICE_POLLING #ifdef DEVICE_POLLING
/********************************************************************* /*********************************************************************
* *
* Legacy polling routine * Legacy polling routine : if using this code you MUST be sure that
* multiqueue is not defined, ie, set igb_num_queues to 1.
* *
*********************************************************************/ *********************************************************************/
#if __FreeBSD_version >= 800000 #if __FreeBSD_version >= 800000
@ -1328,12 +1329,12 @@ static void
#endif #endif
igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
{ {
struct adapter *adapter = ifp->if_softc; struct adapter *adapter = ifp->if_softc;
struct rx_ring *rxr = adapter->rx_rings; struct igb_queue *que = adapter->queues;
struct tx_ring *txr = adapter->tx_rings; struct tx_ring *txr = adapter->tx_rings;
u32 reg_icr, rx_done = 0; u32 reg_icr, rx_done = 0;
u32 loop = IGB_MAX_LOOP; u32 loop = IGB_MAX_LOOP;
bool more; bool more;
IGB_CORE_LOCK(adapter); IGB_CORE_LOCK(adapter);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
@ -1353,7 +1354,7 @@ igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
IGB_CORE_UNLOCK(adapter); IGB_CORE_UNLOCK(adapter);
/* TODO: rx_count */ /* TODO: rx_count */
rx_done = igb_rxeof(rxr, count) ? 1 : 0; rx_done = igb_rxeof(que, count) ? 1 : 0;
IGB_TX_LOCK(txr); IGB_TX_LOCK(txr);
do { do {