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

Commit 528f7272 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

vxge: code cleanup and reorganization 



Move function locations to remove the need for internal declarations and
other misc clean-ups.

Signed-off-by: default avatarJon Mason <jon.mason@exar.com>
Signed-off-by: default avatarArpit Patel <arpit.patel@exar.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent deef4b52

drivers/net/vxge/vxge-config.c

+1666 −1791

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/vxge/vxge-config.h

+16 −18
Original line number Diff line number Diff line
@@ -815,8 +815,8 @@ struct vxge_hw_device_hw_info { 
	u8		serial_number[VXGE_HW_INFO_LEN];

	u8		part_number[VXGE_HW_INFO_LEN];

	u8		product_desc[VXGE_HW_INFO_LEN];

	u8 (mac_addrs)[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];

	u8 (mac_addr_masks)[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];

	u8 mac_addrs[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];

	u8 mac_addr_masks[VXGE_HW_MAX_VIRTUAL_PATHS][ETH_ALEN];

};



/**
@@ -862,16 +862,6 @@ struct vxge_hw_device_attr { 
				VXGE_HW_STATS_OP_READ, \

				loc, \

				offset, \

				&val64);			\

								\

	if (status != VXGE_HW_OK)				\

		return status;						\

}



#define VXGE_HW_VPATH_STATS_PIO_READ(offset) {				\

	status = __vxge_hw_vpath_stats_access(vpath, \

			VXGE_HW_STATS_OP_READ, \

			offset, \

				&val64);			\

	if (status != VXGE_HW_OK)				\

		return status;						\
@@ -1927,6 +1917,15 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev, 
	return vaddr;

}



static inline void vxge_os_dma_free(struct pci_dev *pdev, const void *vaddr,

			struct pci_dev **p_dma_acch)

{

	unsigned long misaligned = *(unsigned long *)p_dma_acch;

	u8 *tmp = (u8 *)vaddr;

	tmp -= misaligned;

	kfree((void *)tmp);

}



/*

 * __vxge_hw_mempool_item_priv - will return pointer on per item private space

 */
@@ -1996,7 +1995,6 @@ enum vxge_hw_status vxge_hw_vpath_mtu_set( 
void

vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp);





#ifndef readq

static inline u64 readq(void __iomem *addr)

{

drivers/net/vxge/vxge-main.c

+226 −248

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/vxge/vxge-main.h

+3 −5
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ struct vxge_vpath { 
	int is_configured;

	int is_open;

	struct vxgedev *vdev;

	u8 (macaddr)[ETH_ALEN];

	u8 (macmask)[ETH_ALEN];

	u8 macaddr[ETH_ALEN];

	u8 macmask[ETH_ALEN];



#define VXGE_MAX_LEARN_MAC_ADDR_CNT	2048

	/* mac addresses currently programmed into NIC */
@@ -420,10 +420,8 @@ struct vxge_tx_priv { 
		mod_timer(&timer, (jiffies + exp)); \

	} while (0);



extern void vxge_initialize_ethtool_ops(struct net_device *ndev);



void vxge_initialize_ethtool_ops(struct net_device *ndev);

enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);



int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);



/**

drivers/net/vxge/vxge-traffic.c

+719 −732

File changed.

Preview size limit exceeded, changes collapsed.