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

Commit 13ba9c77 authored by Mithlesh Thukral's avatar Mithlesh Thukral Committed by Jeff Garzik
Browse files

NetXen: Removal of redundant argument passing 



NetXen: Removal of redundant function call parameters and bug fixes.
This patch will remove the redundant paramters which were being passed to
many functions since now adapter->portnum can be used.

Signed-off-by: default avatarMithlesh Thukral <mithlesh@netxen.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3176ff3e

drivers/net/netxen/netxen_nic.h

+15 −18
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ enum { 


#define MAX_CMD_DESCRIPTORS		1024

#define MAX_RCV_DESCRIPTORS		16384

#define MAX_RCV_DESCRIPTORS_1G		(MAX_RCV_DESCRIPTORS / 4)

#define MAX_JUMBO_RCV_DESCRIPTORS	1024

#define MAX_LRO_RCV_DESCRIPTORS		64

#define MAX_RCVSTATUS_DESCRIPTORS	MAX_RCV_DESCRIPTORS
@@ -780,6 +781,7 @@ struct netxen_hardware_context { 
	struct pci_dev *cmd_desc_pdev;

	dma_addr_t cmd_desc_phys_addr;

	struct netxen_adapter *adapter;

	int pci_func;

};



#define RCV_RING_LRO	RCV_DESC_LRO
@@ -916,15 +918,15 @@ struct netxen_adapter { 
	struct netxen_ring_ctx *ctx_desc;

	struct pci_dev *ctx_desc_pdev;

	dma_addr_t ctx_desc_phys_addr;

	int (*enable_phy_interrupts) (struct netxen_adapter *, int);

	int (*disable_phy_interrupts) (struct netxen_adapter *, int);

	int (*enable_phy_interrupts) (struct netxen_adapter *);

	int (*disable_phy_interrupts) (struct netxen_adapter *);

	void (*handle_phy_intr) (struct netxen_adapter *);

	int (*macaddr_set) (struct netxen_adapter *, netxen_ethernet_macaddr_t);

	int (*set_mtu) (struct netxen_adapter *, int);

	int (*set_promisc) (struct netxen_adapter *, netxen_niu_prom_mode_t);

	int (*unset_promisc) (struct netxen_adapter *, netxen_niu_prom_mode_t);

	int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);

	int (*phy_read) (struct netxen_adapter *, long reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, long reg, u32 val);

	int (*init_port) (struct netxen_adapter *, int);

	void (*init_niu) (struct netxen_adapter *);

	int (*stop_port) (struct netxen_adapter *);
@@ -970,27 +972,21 @@ static inline void __iomem *pci_base(struct netxen_adapter *adapter, 
	return NULL;

}



int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,

					  int port);

int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,

					 int port);

int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter,

					   int port);

int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter,

					  int port);

int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter,

					 int port);

int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter,

					int port);

int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter);

void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter);

void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter);

void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, int port,

				 long enable);

void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, int port,

				  long enable);

int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy, long reg,

int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg,

			    __u32 * readval);

int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long phy,

int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter,

			     long reg, __u32 val);



/* Functions available from netxen_nic_hw.c */
@@ -1010,6 +1006,7 @@ int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, void *data, 
			   int len);

void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,

				 unsigned long off, int data);

int netxen_nic_erase_pxe(struct netxen_adapter *adapter);



/* Functions from netxen_nic_init.c */

void netxen_free_adapter_offload(struct netxen_adapter *adapter);

drivers/net/netxen/netxen_nic_ethtool.c

+5 −5
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {

		/* autonegotiation */

		if (adapter->phy_write

		    && adapter->phy_write(adapter, adapter->portnum,

		    && adapter->phy_write(adapter,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  ecmd->autoneg) != 0)

			return -EIO;
@@ -219,7 +219,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
			adapter->link_autoneg = ecmd->autoneg;



		if (adapter->phy_read

		    && adapter->phy_read(adapter, adapter->portnum,

		    && adapter->phy_read(adapter,

					 NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					 &status) != 0)

			return -EIO;
@@ -242,7 +242,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		if (ecmd->duplex == DUPLEX_FULL)

			netxen_set_phy_duplex(status);

		if (adapter->phy_write

		    && adapter->phy_write(adapter, adapter->portnum,

		    && adapter->phy_write(adapter,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					  *((int *)&status)) != 0)

			return -EIO;
@@ -399,7 +399,7 @@ static u32 netxen_nic_test_link(struct net_device *dev) 
	/* read which mode */

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {

		if (adapter->phy_read

		    && adapter->phy_read(adapter, adapter->portnum,

		    && adapter->phy_read(adapter,

					 NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					 &status) != 0)

			return -EIO;
@@ -579,7 +579,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
		/* set autoneg */

		autoneg = pause->autoneg;

		if (adapter->phy_write

		    && adapter->phy_write(adapter, adapter->portnum,

		    && adapter->phy_write(adapter,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  autoneg) != 0)

			return -EIO;

drivers/net/netxen/netxen_nic_hdr.h

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ enum { 
	/* 10 seconds before we give up */

#define	NETXEN_NIU_PHY_WAITMAX		50

#define	NETXEN_NIU_MAX_GBE_PORTS	4

#define	NETXEN_NIU_MAX_XG_PORTS		2



#define	NETXEN_NIU_MODE			(NETXEN_CRB_NIU + 0x00000)

drivers/net/netxen/netxen_nic_hw.c

+15 −4
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw) 


	if (adapter->curr_window == wndw)

		return;

	switch(adapter->portnum) {

	switch(adapter->ahw.pci_func) {

		case 0:

			offset = PCI_OFFSET_SECOND_RANGE(adapter,

					NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
@@ -606,7 +606,7 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw) 
			break;

		default:

			printk(KERN_INFO "Changing the window for PCI function"

					"%d\n",	adapter->portnum);

					"%d\n",	adapter->ahw.pci_func);

			offset = PCI_OFFSET_SECOND_RANGE(adapter,

					NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));

			break;
@@ -881,6 +881,17 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter, 
	return addr;

}



int

netxen_nic_erase_pxe(struct netxen_adapter *adapter)

{

	if (netxen_rom_fast_write(adapter, PXE_START, 0) == -1) {

		printk(KERN_ERR "%s: erase pxe failed\n", 

			netxen_nic_driver_name);

		return -1;

	}

	return 0;

}



int netxen_nic_get_board_info(struct netxen_adapter *adapter)

{

	int rv = 0;
@@ -991,7 +1002,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter) 
	if (netxen_get_niu_enable_ge(mode)) {	/* Gb 10/100/1000 Mbps mode */

		if (adapter->phy_read

		    && adapter->

		    phy_read(adapter, adapter->portnum,

		    phy_read(adapter,

			     NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

			     &status) == 0) {

			if (netxen_get_phy_link(status)) {
@@ -1022,7 +1033,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter) 
				}

				if (adapter->phy_read

				    && adapter->

				    phy_read(adapter, adapter->portnum,

				    phy_read(adapter,

					     NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					     &autoneg) != 0)

					adapter->link_autoneg = autoneg;

drivers/net/netxen/netxen_nic_hw.h

+2 −2
Original line number Diff line number Diff line
@@ -458,13 +458,13 @@ int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter, 
				       netxen_niu_prom_mode_t mode);



/* get/set the MAC address for a given MAC */

int netxen_niu_macaddr_get(struct netxen_adapter *adapter, int port,

int netxen_niu_macaddr_get(struct netxen_adapter *adapter,

			   netxen_ethernet_macaddr_t * addr);

int netxen_niu_macaddr_set(struct netxen_adapter *adapter,

			   netxen_ethernet_macaddr_t addr);



/* XG versons */

int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter, int port,

int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter,

			      netxen_ethernet_macaddr_t * addr);

int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,

			      netxen_ethernet_macaddr_t addr);