From 0bedc9eeea73b4b6bf0867daa8543f4c7e8b6baf Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Thu, 1 Jul 2010 13:38:16 +0000 Subject: [PATCH] --- yaml --- r: 203343 b: refs/heads/master c: 5fa8517f038d51d571981fb495206cc30ed91b06 h: refs/heads/master i: 203341: 41294118ef9af099de1aea04f5b24a1b62706e41 203339: 1680a9ead1100264ed6728cf7622f24b9152cea7 203335: 3f428fae8fee69ad8f79de9bd69c91be5197f6fd 203327: 323f60d7c39e46ff9864c787928fe6ccbdfdddfa v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0294dd72b131..413b1254ec4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ede3ef0d940ef052466f42c849390b23c6859abc +refs/heads/master: 5fa8517f038d51d571981fb495206cc30ed91b06 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 3881918f5382..e79689eeb1fe 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -630,9 +630,6 @@ static void igb_cache_ring_register(struct igb_adapter *adapter) for (; i < adapter->rss_queues; i++) adapter->rx_ring[i]->reg_idx = rbase_offset + Q_IDX_82576(i); - for (; j < adapter->rss_queues; j++) - adapter->tx_ring[j]->reg_idx = rbase_offset + - Q_IDX_82576(j); } case e1000_82575: case e1000_82580: @@ -996,7 +993,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter) /* Number of supported queues. */ adapter->num_rx_queues = adapter->rss_queues; - adapter->num_tx_queues = adapter->rss_queues; + if (adapter->vfs_allocated_count) + adapter->num_tx_queues = 1; + else + adapter->num_tx_queues = adapter->rss_queues; /* start with one vector for every rx queue */ numvecs = adapter->num_rx_queues;