igb: resolve warning of unused adapter struct

If DCA is undefined then the adapter struct becomes unnecessary.  To
resolve this issue the DCA calls can simply make a call to the adapter
struct through the rx_ring adapter struct member.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2009-03-13 20:40:58 +00:00 committed by David S. Miller
parent 5e6d5b17db
commit bd38e5d124

View File

@ -4186,18 +4186,17 @@ static inline void igb_rx_irq_enable(struct igb_ring *rx_ring)
static int igb_poll(struct napi_struct *napi, int budget) static int igb_poll(struct napi_struct *napi, int budget)
{ {
struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi); struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi);
struct igb_adapter *adapter = rx_ring->adapter;
int work_done = 0; int work_done = 0;
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
if (adapter->flags & IGB_FLAG_DCA_ENABLED) if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_rx_dca(rx_ring); igb_update_rx_dca(rx_ring);
#endif #endif
igb_clean_rx_irq_adv(rx_ring, &work_done, budget); igb_clean_rx_irq_adv(rx_ring, &work_done, budget);
if (rx_ring->buddy) { if (rx_ring->buddy) {
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
if (adapter->flags & IGB_FLAG_DCA_ENABLED) if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_tx_dca(rx_ring->buddy); igb_update_tx_dca(rx_ring->buddy);
#endif #endif
if (!igb_clean_tx_irq(rx_ring->buddy)) if (!igb_clean_tx_irq(rx_ring->buddy))