aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000/e1000.h11
-rw-r--r--drivers/net/e1000/e1000_ethtool.c13
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 {
353extern char e1000_driver_name[]; 353extern char e1000_driver_name[];
354extern const char e1000_driver_version[]; 354extern const char e1000_driver_version[];
355 355
356extern int e1000_up(struct e1000_adapter *adapter);
357extern void e1000_down(struct e1000_adapter *adapter);
358extern void e1000_reinit_locked(struct e1000_adapter *adapter);
359extern void e1000_reset(struct e1000_adapter *adapter);
360extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
361extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
362extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
363extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
364extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
365extern void e1000_update_stats(struct e1000_adapter *adapter);
356extern void e1000_power_up_phy(struct e1000_adapter *); 366extern void e1000_power_up_phy(struct e1000_adapter *);
357extern void e1000_set_ethtool_ops(struct net_device *netdev); 367extern void e1000_set_ethtool_ops(struct net_device *netdev);
358extern void e1000_check_options(struct e1000_adapter *adapter); 368extern 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
35extern int e1000_up(struct e1000_adapter *adapter);
36extern void e1000_down(struct e1000_adapter *adapter);
37extern void e1000_reinit_locked(struct e1000_adapter *adapter);
38extern void e1000_reset(struct e1000_adapter *adapter);
39extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
40extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
41extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
42extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
43extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
44extern void e1000_update_stats(struct e1000_adapter *adapter);
45
46
47struct e1000_stats { 34struct e1000_stats {
48 char stat_string[ETH_GSTRING_LEN]; 35 char stat_string[ETH_GSTRING_LEN];
49 int sizeof_stat; 36 int sizeof_stat;