ixgbe: fix dca defines to not have spaces
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
af72166f31
commit
a1f96ee7cc
|
@ -80,7 +80,7 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
|
||||
void *p);
|
||||
static struct notifier_block dca_notifier = {
|
||||
|
@ -309,7 +309,7 @@ done_cleaning:
|
|||
return (total_packets ? true : false);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
|
||||
struct ixgbe_ring *rx_ring)
|
||||
{
|
||||
|
@ -934,7 +934,7 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
|
|||
r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
|
||||
for (i = 0; i < q_vector->txr_count; i++) {
|
||||
tx_ring = &(adapter->tx_ring[r_idx]);
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
|
||||
ixgbe_update_tx_dca(adapter, tx_ring);
|
||||
#endif
|
||||
|
@ -999,7 +999,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
|
|||
|
||||
r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
|
||||
rx_ring = &(adapter->rx_ring[r_idx]);
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
|
||||
ixgbe_update_rx_dca(adapter, rx_ring);
|
||||
#endif
|
||||
|
@ -2102,7 +2102,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
|
|||
netif_carrier_off(netdev);
|
||||
netif_tx_stop_all_queues(netdev);
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
|
||||
adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
|
||||
dca_remove_requester(&adapter->pdev->dev);
|
||||
|
@ -2114,7 +2114,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
|
|||
ixgbe_clean_all_tx_rings(adapter);
|
||||
ixgbe_clean_all_rx_rings(adapter);
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
/* since we reset the hardware DCA settings were cleared */
|
||||
if (dca_add_requester(&adapter->pdev->dev) == 0) {
|
||||
adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
|
||||
|
@ -2178,7 +2178,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)
|
|||
struct ixgbe_adapter *adapter = q_vector->adapter;
|
||||
int tx_cleaned = 0, work_done = 0;
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
|
||||
ixgbe_update_tx_dca(adapter, adapter->tx_ring);
|
||||
ixgbe_update_rx_dca(adapter, adapter->rx_ring);
|
||||
|
@ -3754,7 +3754,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
if (err)
|
||||
goto err_register;
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (dca_add_requester(&pdev->dev) == 0) {
|
||||
adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
|
||||
/* always use CB2 mode, difference is masked
|
||||
|
@ -3804,7 +3804,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
|
|||
|
||||
flush_scheduled_work();
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
|
||||
adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
|
||||
dca_remove_requester(&pdev->dev);
|
||||
|
@ -3937,7 +3937,7 @@ static int __init ixgbe_init_module(void)
|
|||
|
||||
printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
dca_register_notify(&dca_notifier);
|
||||
|
||||
#endif
|
||||
|
@ -3954,13 +3954,13 @@ module_init(ixgbe_init_module);
|
|||
**/
|
||||
static void __exit ixgbe_exit_module(void)
|
||||
{
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
dca_unregister_notify(&dca_notifier);
|
||||
#endif
|
||||
pci_unregister_driver(&ixgbe_driver);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE)
|
||||
#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
|
||||
static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
|
||||
void *p)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue