Commit 79aefa45 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

ixgbe: fix compilation with gcc-3.4 



  CC [M]  drivers/net/ixgbe/ixgbe_main.o
drivers/net/ixgbe/ixgbe_main.c: In function `ixgbe_intr':
drivers/net/ixgbe/ixgbe_main.c:1290: sorry, unimplemented: inlining failed in call to 'ixgbe_irq_enable': function body not available
drivers/net/ixgbe/ixgbe_main.c:1312: sorry, unimplemented: called from here
make[4]: *** [drivers/net/ixgbe/ixgbe_main.o] Error 1

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfdbc0ac

drivers/net/ixgbe/ixgbe_main.c

+28 −30
Original line number Diff line number Diff line
@@ -1287,7 +1287,34 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter) 
	return;

}



static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter);

/**

 * ixgbe_irq_disable - Mask off interrupt generation on the NIC

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)

{

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);

	IXGBE_WRITE_FLUSH(&adapter->hw);

	if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {

		int i;

		for (i = 0; i < adapter->num_msix_vectors; i++)

			synchronize_irq(adapter->msix_entries[i].vector);

	} else {

		synchronize_irq(adapter->pdev->irq);

	}

}



/**

 * ixgbe_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)

{

	u32 mask;

	mask = IXGBE_EIMS_ENABLE_MASK;

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);

	IXGBE_WRITE_FLUSH(&adapter->hw);

}



/**

 * ixgbe_intr - legacy mode Interrupt Handler
@@ -1393,35 +1420,6 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter) 
	}

}



/**

 * ixgbe_irq_disable - Mask off interrupt generation on the NIC

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)

{

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);

	IXGBE_WRITE_FLUSH(&adapter->hw);

	if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {

		int i;

		for (i = 0; i < adapter->num_msix_vectors; i++)

			synchronize_irq(adapter->msix_entries[i].vector);

	} else {

		synchronize_irq(adapter->pdev->irq);

	}

}



/**

 * ixgbe_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 **/

static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)

{

	u32 mask;

	mask = IXGBE_EIMS_ENABLE_MASK;

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);

	IXGBE_WRITE_FLUSH(&adapter->hw);

}



/**

 * ixgbe_configure_msi_and_legacy - Initialize PIN (INTA...) and MSI interrupts

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE