From: Adrian Bunk <[EMAIL PROTECTED]>
This patch moves prototypes of global variables and functions to a header
file.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Acked-by: John Ronciak <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/net/e1000/e1000.h | 22 ++++++++++++++++++++++
drivers/net/e1000/e1000_ethtool.c | 13 -------------
drivers/net/e1000/e1000_main.c | 14 --------------
3 files changed, 22 insertions(+), 27 deletions(-)
diff -puN drivers/net/e1000/e1000_ethtool.c~drivers-net-e1000-proper-prototypes
drivers/net/e1000/e1000_ethtool.c
--- devel/drivers/net/e1000/e1000_ethtool.c~drivers-net-e1000-proper-prototypes
2006-03-08 00:05:51.000000000 -0800
+++ devel-akpm/drivers/net/e1000/e1000_ethtool.c 2006-03-08
00:05:51.000000000 -0800
@@ -32,19 +32,6 @@
#include <asm/uaccess.h>
-extern char e1000_driver_name[];
-extern char e1000_driver_version[];
-
-extern int e1000_up(struct e1000_adapter *adapter);
-extern void e1000_down(struct e1000_adapter *adapter);
-extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
-extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_update_stats(struct e1000_adapter *adapter);
-
struct e1000_stats {
char stat_string[ETH_GSTRING_LEN];
int sizeof_stat;
diff -puN drivers/net/e1000/e1000.h~drivers-net-e1000-proper-prototypes
drivers/net/e1000/e1000.h
--- devel/drivers/net/e1000/e1000.h~drivers-net-e1000-proper-prototypes
2006-03-08 00:05:51.000000000 -0800
+++ devel-akpm/drivers/net/e1000/e1000.h 2006-03-08 00:05:51.000000000
-0800
@@ -339,4 +339,26 @@ struct e1000_adapter {
boolean_t tso_force;
#endif
};
+
+
+/* e1000_main.c */
+extern char e1000_driver_name[];
+extern char e1000_driver_version[];
+int e1000_up(struct e1000_adapter *adapter);
+void e1000_down(struct e1000_adapter *adapter);
+void e1000_reset(struct e1000_adapter *adapter);
+int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
+int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+void e1000_update_stats(struct e1000_adapter *adapter);
+int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+
+/* e1000_ethtool.c */
+void e1000_set_ethtool_ops(struct net_device *netdev);
+
+/* e1000_param.c */
+void e1000_check_options(struct e1000_adapter *adapter);
+
+
#endif /* _E1000_H_ */
diff -puN drivers/net/e1000/e1000_main.c~drivers-net-e1000-proper-prototypes
drivers/net/e1000/e1000_main.c
--- devel/drivers/net/e1000/e1000_main.c~drivers-net-e1000-proper-prototypes
2006-03-08 00:05:51.000000000 -0800
+++ devel-akpm/drivers/net/e1000/e1000_main.c 2006-03-08 00:05:51.000000000
-0800
@@ -140,14 +140,6 @@ static struct pci_device_id e1000_pci_tb
MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
-int e1000_up(struct e1000_adapter *adapter);
-void e1000_down(struct e1000_adapter *adapter);
-void e1000_reset(struct e1000_adapter *adapter);
-int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
-int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
struct e1000_tx_ring *txdr);
static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
@@ -156,7 +148,6 @@ static void e1000_free_tx_resources(stru
struct e1000_tx_ring *tx_ring);
static void e1000_free_rx_resources(struct e1000_adapter *adapter,
struct e1000_rx_ring *rx_ring);
-void e1000_update_stats(struct e1000_adapter *adapter);
/* Local Function Prototypes */
@@ -212,7 +203,6 @@ static void e1000_alloc_rx_buffers_ps(st
static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
int cmd);
-void e1000_set_ethtool_ops(struct net_device *netdev);
static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
static void e1000_tx_timeout(struct net_device *dev);
@@ -237,10 +227,6 @@ static void e1000_netpoll (struct net_de
#endif
-/* Exported from other modules */
-
-extern void e1000_check_options(struct e1000_adapter *adapter);
-
static struct pci_driver e1000_driver = {
.name = e1000_driver_name,
.id_table = e1000_pci_tbl,
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
