diff options
author | Joe Perches <joe@perches.com> | 2008-07-11 18:17:13 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-22 19:38:50 -0400 |
commit | c03e83b0351f8a9464d32f31302ec75ba88518dc (patch) | |
tree | 3995c118b813437c7ac1e4ce17c5be362e10e227 | |
parent | 1dc329180fe22ff8651e0ef550ba17ca1cc7bf22 (diff) |
e1000: Move extern function definitions to e1000.h
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/e1000/e1000.h | 11 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 13 |
2 files changed, 10 insertions, 14 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 31feae1ea390..20188af0ccdd 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -353,9 +353,18 @@ enum e1000_state_t { | |||
353 | extern char e1000_driver_name[]; | 353 | extern char e1000_driver_name[]; |
354 | extern const char e1000_driver_version[]; | 354 | extern const char e1000_driver_version[]; |
355 | 355 | ||
356 | extern int e1000_up(struct e1000_adapter *adapter); | ||
357 | extern void e1000_down(struct e1000_adapter *adapter); | ||
358 | extern void e1000_reinit_locked(struct e1000_adapter *adapter); | ||
359 | extern void e1000_reset(struct e1000_adapter *adapter); | ||
360 | extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx); | ||
361 | extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); | ||
362 | extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); | ||
363 | extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter); | ||
364 | extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter); | ||
365 | extern void e1000_update_stats(struct e1000_adapter *adapter); | ||
356 | extern void e1000_power_up_phy(struct e1000_adapter *); | 366 | extern void e1000_power_up_phy(struct e1000_adapter *); |
357 | extern void e1000_set_ethtool_ops(struct net_device *netdev); | 367 | extern void e1000_set_ethtool_ops(struct net_device *netdev); |
358 | extern void e1000_check_options(struct e1000_adapter *adapter); | 368 | extern void e1000_check_options(struct e1000_adapter *adapter); |
359 | 369 | ||
360 | |||
361 | #endif /* _E1000_H_ */ | 370 | #endif /* _E1000_H_ */ |
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 966d52a529ec..e262605c4700 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -29,21 +29,8 @@ | |||
29 | /* ethtool support for e1000 */ | 29 | /* ethtool support for e1000 */ |
30 | 30 | ||
31 | #include "e1000.h" | 31 | #include "e1000.h" |
32 | |||
33 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
34 | 33 | ||
35 | extern int e1000_up(struct e1000_adapter *adapter); | ||
36 | extern void e1000_down(struct e1000_adapter *adapter); | ||
37 | extern void e1000_reinit_locked(struct e1000_adapter *adapter); | ||
38 | extern void e1000_reset(struct e1000_adapter *adapter); | ||
39 | extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx); | ||
40 | extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); | ||
41 | extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); | ||
42 | extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter); | ||
43 | extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter); | ||
44 | extern void e1000_update_stats(struct e1000_adapter *adapter); | ||
45 | |||
46 | |||
47 | struct e1000_stats { | 34 | struct e1000_stats { |
48 | char stat_string[ETH_GSTRING_LEN]; | 35 | char stat_string[ETH_GSTRING_LEN]; |
49 | int sizeof_stat; | 36 | int sizeof_stat; |