aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgb/ixgb_main.c
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2008-07-08 18:52:08 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-07-11 01:20:28 -0400
commit7490d71a9245fd59e6cd5732cba4d6b744db581a (patch)
treef38c877dd9c03ae1e604bedbcee630260f694fcd /drivers/net/ixgb/ixgb_main.c
parentd9fed18bf9090bd0682f3c611c40261a98a2842d (diff)
ixgb: clean up un-necessary declarations
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/ixgb/ixgb_main.c')
-rw-r--r--drivers/net/ixgb/ixgb_main.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 4e422c4cbe83..fc2cf0edb7e5 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -61,7 +61,7 @@ static struct pci_device_id ixgb_pci_tbl[] = {
61 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 61 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
62 {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, 62 {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
63 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 63 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
64 {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR, 64 {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
65 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 65 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
66 66
67 /* required last entry */ 67 /* required last entry */
@@ -71,16 +71,6 @@ static struct pci_device_id ixgb_pci_tbl[] = {
71MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl); 71MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
72 72
73/* Local Function Prototypes */ 73/* Local Function Prototypes */
74
75int ixgb_up(struct ixgb_adapter *adapter);
76void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
77void ixgb_reset(struct ixgb_adapter *adapter);
78int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
79int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
80void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
81void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
82void ixgb_update_stats(struct ixgb_adapter *adapter);
83
84static int ixgb_init_module(void); 74static int ixgb_init_module(void);
85static void ixgb_exit_module(void); 75static void ixgb_exit_module(void);
86static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 76static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -103,17 +93,18 @@ static irqreturn_t ixgb_intr(int irq, void *data);
103static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter); 93static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
104 94
105#ifdef CONFIG_IXGB_NAPI 95#ifdef CONFIG_IXGB_NAPI
106static int ixgb_clean(struct napi_struct *napi, int budget); 96static int ixgb_clean(struct napi_struct *, int);
107static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter, 97static bool ixgb_clean_rx_irq(struct ixgb_adapter *, int *, int);
108 int *work_done, int work_to_do);
109#else 98#else
110static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter); 99static bool ixgb_clean_rx_irq(struct ixgb_adapter *);
111#endif 100#endif
112static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter); 101static void ixgb_alloc_rx_buffers(struct ixgb_adapter *);
102
113static void ixgb_tx_timeout(struct net_device *dev); 103static void ixgb_tx_timeout(struct net_device *dev);
114static void ixgb_tx_timeout_task(struct work_struct *work); 104static void ixgb_tx_timeout_task(struct work_struct *work);
105
115static void ixgb_vlan_rx_register(struct net_device *netdev, 106static void ixgb_vlan_rx_register(struct net_device *netdev,
116 struct vlan_group *grp); 107 struct vlan_group *grp);
117static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid); 108static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
118static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid); 109static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
119static void ixgb_restore_vlan(struct ixgb_adapter *adapter); 110static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
@@ -124,7 +115,7 @@ static void ixgb_netpoll(struct net_device *dev);
124#endif 115#endif
125 116
126static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, 117static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
127 enum pci_channel_state state); 118 enum pci_channel_state state);
128static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev); 119static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev);
129static void ixgb_io_resume (struct pci_dev *pdev); 120static void ixgb_io_resume (struct pci_dev *pdev);
130 121