Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30dcbf29 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

[PATCH] drivers/net/e1000/: proper prototypes 



This patch moves prototypes of global variables and functions to a header
file.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarJohn Ronciak <john.ronciak@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ded78e5e

drivers/net/e1000/e1000.h

+22 −0
Original line number Diff line number Diff line
@@ -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_ */

drivers/net/e1000/e1000_ethtool.c

+0 −13
Original line number Diff line number Diff line
@@ -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;

drivers/net/e1000/e1000_main.c

+0 −14
Original line number Diff line number Diff line
@@ -140,14 +140,6 @@ static struct pci_device_id e1000_pci_tbl[] = { 


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(struct e1000_adapter *adapter, 
                                    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(struct e1000_adapter *adapter, 
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_device *netdev); 
#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,