aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2008-09-11 22:54:48 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 18:54:47 -0400
commita1f96ee7cce0dce583ff2f32de6376495ef51e4d (patch)
tree33d607a837fd5934ba6b38afc717b76bc73e029f /drivers/net/ixgbe/ixgbe_main.c
parentaf72166f31662850e10d1d1c734654efb2ae4357 (diff)
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>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index c67211c91cb..904819586e2 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -80,7 +80,7 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
80}; 80};
81MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl); 81MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
82 82
83#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 83#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
84static int ixgbe_notify_dca(struct notifier_block *, unsigned long event, 84static int ixgbe_notify_dca(struct notifier_block *, unsigned long event,
85 void *p); 85 void *p);
86static struct notifier_block dca_notifier = { 86static struct notifier_block dca_notifier = {
@@ -309,7 +309,7 @@ done_cleaning:
309 return (total_packets ? true : false); 309 return (total_packets ? true : false);
310} 310}
311 311
312#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 312#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
313static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter, 313static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
314 struct ixgbe_ring *rx_ring) 314 struct ixgbe_ring *rx_ring)
315{ 315{
@@ -934,7 +934,7 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
934 r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues); 934 r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
935 for (i = 0; i < q_vector->txr_count; i++) { 935 for (i = 0; i < q_vector->txr_count; i++) {
936 tx_ring = &(adapter->tx_ring[r_idx]); 936 tx_ring = &(adapter->tx_ring[r_idx]);
937#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 937#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
938 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) 938 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
939 ixgbe_update_tx_dca(adapter, tx_ring); 939 ixgbe_update_tx_dca(adapter, tx_ring);
940#endif 940#endif
@@ -999,7 +999,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
999 999
1000 r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues); 1000 r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
1001 rx_ring = &(adapter->rx_ring[r_idx]); 1001 rx_ring = &(adapter->rx_ring[r_idx]);
1002#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 1002#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
1003 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) 1003 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
1004 ixgbe_update_rx_dca(adapter, rx_ring); 1004 ixgbe_update_rx_dca(adapter, rx_ring);
1005#endif 1005#endif
@@ -2102,7 +2102,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
2102 netif_carrier_off(netdev); 2102 netif_carrier_off(netdev);
2103 netif_tx_stop_all_queues(netdev); 2103 netif_tx_stop_all_queues(netdev);
2104 2104
2105#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 2105#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
2106 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) { 2106 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
2107 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED; 2107 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
2108 dca_remove_requester(&adapter->pdev->dev); 2108 dca_remove_requester(&adapter->pdev->dev);
@@ -2114,7 +2114,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
2114 ixgbe_clean_all_tx_rings(adapter); 2114 ixgbe_clean_all_tx_rings(adapter);
2115 ixgbe_clean_all_rx_rings(adapter); 2115 ixgbe_clean_all_rx_rings(adapter);
2116 2116
2117#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 2117#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
2118 /* since we reset the hardware DCA settings were cleared */ 2118 /* since we reset the hardware DCA settings were cleared */
2119 if (dca_add_requester(&adapter->pdev->dev) == 0) { 2119 if (dca_add_requester(&adapter->pdev->dev) == 0) {
2120 adapter->flags |= IXGBE_FLAG_DCA_ENABLED; 2120 adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
@@ -2178,7 +2178,7 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)
2178 struct ixgbe_adapter *adapter = q_vector->adapter; 2178 struct ixgbe_adapter *adapter = q_vector->adapter;
2179 int tx_cleaned = 0, work_done = 0; 2179 int tx_cleaned = 0, work_done = 0;
2180 2180
2181#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 2181#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
2182 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) { 2182 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
2183 ixgbe_update_tx_dca(adapter, adapter->tx_ring); 2183 ixgbe_update_tx_dca(adapter, adapter->tx_ring);
2184 ixgbe_update_rx_dca(adapter, adapter->rx_ring); 2184 ixgbe_update_rx_dca(adapter, adapter->rx_ring);
@@ -3754,7 +3754,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
3754 if (err) 3754 if (err)
3755 goto err_register; 3755 goto err_register;
3756 3756
3757#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 3757#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
3758 if (dca_add_requester(&pdev->dev) == 0) { 3758 if (dca_add_requester(&pdev->dev) == 0) {
3759 adapter->flags |= IXGBE_FLAG_DCA_ENABLED; 3759 adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
3760 /* always use CB2 mode, difference is masked 3760 /* always use CB2 mode, difference is masked
@@ -3804,7 +3804,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
3804 3804
3805 flush_scheduled_work(); 3805 flush_scheduled_work();
3806 3806
3807#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 3807#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
3808 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) { 3808 if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
3809 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED; 3809 adapter->flags &= ~IXGBE_FLAG_DCA_ENABLED;
3810 dca_remove_requester(&pdev->dev); 3810 dca_remove_requester(&pdev->dev);
@@ -3937,7 +3937,7 @@ static int __init ixgbe_init_module(void)
3937 3937
3938 printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright); 3938 printk(KERN_INFO "%s: %s\n", ixgbe_driver_name, ixgbe_copyright);
3939 3939
3940#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 3940#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
3941 dca_register_notify(&dca_notifier); 3941 dca_register_notify(&dca_notifier);
3942 3942
3943#endif 3943#endif
@@ -3954,13 +3954,13 @@ module_init(ixgbe_init_module);
3954 **/ 3954 **/
3955static void __exit ixgbe_exit_module(void) 3955static void __exit ixgbe_exit_module(void)
3956{ 3956{
3957#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 3957#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
3958 dca_unregister_notify(&dca_notifier); 3958 dca_unregister_notify(&dca_notifier);
3959#endif 3959#endif
3960 pci_unregister_driver(&ixgbe_driver); 3960 pci_unregister_driver(&ixgbe_driver);
3961} 3961}
3962 3962
3963#if defined(CONFIG_DCA) || defined (CONFIG_DCA_MODULE) 3963#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE)
3964static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event, 3964static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
3965 void *p) 3965 void *p)
3966{ 3966{