Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd38e5d1 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

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: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e6d5b17

drivers/net/igb/igb_main.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

{

	struct igb_ring *rx_ring = container_of(napi, struct igb_ring, napi);

	struct igb_adapter *adapter = rx_ring->adapter;

	int work_done = 0;



#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);

#endif

	igb_clean_rx_irq_adv(rx_ring, &work_done, budget);



	if (rx_ring->buddy) {

#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);

#endif

		if (!igb_clean_tx_irq(rx_ring->buddy))