sfc: Cleanup RX queue information

[linux-2.6-omap-h63xx.git] / drivers / net / sfc / net_driver.h

diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 1fa134ab8eb8a0ab8e11687d6fa469f258bafcbe..b5649b16cd43bade6337885b3433bfa06b05004c 100644 (file)
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -231,7 +231,6 @@ struct efx_rx_buffer {
  * struct efx_rx_queue - An Efx RX queue
  * @efx: The associated Efx NIC
  * @queue: DMA queue number
- * @used: Queue is used by net driver
  * @channel: The associated channel
  * @buffer: The software buffer ring
  * @rxd: The hardware descriptor ring
@@ -265,7 +264,6 @@ struct efx_rx_buffer {
 struct efx_rx_queue {
        struct efx_nic *efx;
        int queue;
-       bool used;
        struct efx_channel *channel;
        struct efx_rx_buffer *buffer;
        struct efx_special_buffer rxd;
@@ -628,7 +626,7 @@ union efx_multicast_hash {
  * @tx_queue: TX DMA queues
  * @rx_queue: RX DMA queues
  * @channel: Channels
- * @rss_queues: Number of RSS queues
+ * @n_rx_queues: Number of RX queues
  * @rx_buffer_len: RX buffer length
  * @rx_buffer_order: Order (log2) of number of pages for each RX buffer
  * @irq_status: Interrupt status buffer
@@ -704,7 +702,7 @@ struct efx_nic {
        struct efx_rx_queue rx_queue[EFX_MAX_RX_QUEUES];
        struct efx_channel channel[EFX_MAX_CHANNELS];
 
-       int rss_queues;
+       int n_rx_queues;
        unsigned int rx_buffer_len;
        unsigned int rx_buffer_order;
 
@@ -850,19 +848,15 @@ struct efx_nic_type {
 /* Iterate over all used RX queues */
 #define efx_for_each_rx_queue(_rx_queue, _efx)                         \
        for (_rx_queue = &_efx->rx_queue[0];                            \
-            _rx_queue < &_efx->rx_queue[EFX_MAX_RX_QUEUES];            \
-            _rx_queue++)                                               \
-               if (!_rx_queue->used)                                   \
-                       continue;                                       \
-               else
+            _rx_queue < &_efx->rx_queue[_efx->n_rx_queues];            \
+            _rx_queue++)
 
 /* Iterate over all RX queues belonging to a channel */
 #define efx_for_each_channel_rx_queue(_rx_queue, _channel)             \
        for (_rx_queue = &_channel->efx->rx_queue[0];                   \
             _rx_queue < &_channel->efx->rx_queue[EFX_MAX_RX_QUEUES];   \
             _rx_queue++)                                               \
-               if ((!_rx_queue->used) ||                               \
-                   (_rx_queue->channel != _channel))                   \
+               if (_rx_queue->channel != _channel)                     \
                        continue;                                       \
                else