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

Commit e40c10fc authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

vxge: make local functions static 



Remove unused function vxge_hw_vpath_vid_get

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fd888a5

drivers/net/ethernet/neterion/vxge/vxge-config.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2148,7 +2148,7 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh, 
 * __vxge_hw_ring_replenish - Initial replenish of RxDs

 * __vxge_hw_ring_replenish - Initial replenish of RxDs

 * This function replenishes the RxDs from reserve array to work array

 * This function replenishes the RxDs from reserve array to work array

 */

 */

enum vxge_hw_status

static enum vxge_hw_status

vxge_hw_ring_replenish(struct __vxge_hw_ring *ring)

vxge_hw_ring_replenish(struct __vxge_hw_ring *ring)

{

{

	void *rxd;

	void *rxd;

drivers/net/ethernet/neterion/vxge/vxge-main.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ static unsigned int bw_percentage[VXGE_HW_MAX_VIRTUAL_PATHS] = 
module_param_array(bw_percentage, uint, NULL, 0);

module_param_array(bw_percentage, uint, NULL, 0);





static struct vxge_drv_config *driver_config;

static struct vxge_drv_config *driver_config;

static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);





static inline int is_vxge_card_up(struct vxgedev *vdev)

static inline int is_vxge_card_up(struct vxgedev *vdev)

{

{
@@ -1971,7 +1972,7 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev) 
}

}





/* reset vpaths */

/* reset vpaths */

enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)

static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)

{

{

	enum vxge_hw_status status = VXGE_HW_OK;

	enum vxge_hw_status status = VXGE_HW_OK;

	struct vxge_vpath *vpath;

	struct vxge_vpath *vpath;

drivers/net/ethernet/neterion/vxge/vxge-main.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -427,7 +427,6 @@ void vxge_os_timer(struct timer_list *timer, void (*func)(unsigned long data), 
}

}





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);

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





/* #define VXGE_DEBUG_INIT: debug for initialization functions

/* #define VXGE_DEBUG_INIT: debug for initialization functions

drivers/net/ethernet/neterion/vxge/vxge-traffic.c

+2 −35
Original line number Original line Diff line number Diff line
@@ -1956,8 +1956,7 @@ vxge_hw_vpath_mac_addr_delete( 
 * @vid: vlan id to be added for this vpath into the list

 * @vid: vlan id to be added for this vpath into the list

 *

 *

 * Adds the given vlan id into the list for this  vpath.

 * Adds the given vlan id into the list for this  vpath.

 * see also: vxge_hw_vpath_vid_delete, vxge_hw_vpath_vid_get and

 * see also: vxge_hw_vpath_vid_delete

 * vxge_hw_vpath_vid_get_next

 *

 *

 */

 */

enum vxge_hw_status

enum vxge_hw_status
@@ -1978,37 +1977,6 @@ vxge_hw_vpath_vid_add(struct __vxge_hw_vpath_handle *vp, u64 vid) 
	return status;

	return status;

}

}





/**

 * vxge_hw_vpath_vid_get - Get the first vid entry for this vpath

 *               from vlan id table.

 * @vp: Vpath handle.

 * @vid: Buffer to return vlan id

 *

 * Returns the first vlan id in the list for this vpath.

 * see also: vxge_hw_vpath_vid_get_next

 *

 */

enum vxge_hw_status

vxge_hw_vpath_vid_get(struct __vxge_hw_vpath_handle *vp, u64 *vid)

{

	u64 data;

	enum vxge_hw_status status = VXGE_HW_OK;



	if (vp == NULL) {

		status = VXGE_HW_ERR_INVALID_HANDLE;

		goto exit;

	}



	status = __vxge_hw_vpath_rts_table_get(vp,

			VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_LIST_FIRST_ENTRY,

			VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_VID,

			0, vid, &data);



	*vid = VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_VLAN_ID(*vid);

exit:

	return status;

}



/**

/**

 * vxge_hw_vpath_vid_delete - Delete the vlan id entry for this vpath

 * vxge_hw_vpath_vid_delete - Delete the vlan id entry for this vpath

 *               to vlan id table.

 *               to vlan id table.
@@ -2016,8 +1984,7 @@ vxge_hw_vpath_vid_get(struct __vxge_hw_vpath_handle *vp, u64 *vid) 
 * @vid: vlan id to be added for this vpath into the list

 * @vid: vlan id to be added for this vpath into the list

 *

 *

 * Adds the given vlan id into the list for this  vpath.

 * Adds the given vlan id into the list for this  vpath.

 * see also: vxge_hw_vpath_vid_add, vxge_hw_vpath_vid_get and

 * see also: vxge_hw_vpath_vid_add

 * vxge_hw_vpath_vid_get_next

 *

 *

 */

 */

enum vxge_hw_status

enum vxge_hw_status

drivers/net/ethernet/neterion/vxge/vxge-traffic.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -1918,9 +1918,6 @@ vxge_hw_ring_rxd_post_post( 
	struct __vxge_hw_ring *ring_handle,

	struct __vxge_hw_ring *ring_handle,

	void *rxdh);

	void *rxdh);





enum vxge_hw_status

vxge_hw_ring_replenish(struct __vxge_hw_ring *ring_handle);



void

void

vxge_hw_ring_rxd_post_post_wmb(

vxge_hw_ring_rxd_post_post_wmb(

	struct __vxge_hw_ring *ring_handle,

	struct __vxge_hw_ring *ring_handle,
@@ -2185,11 +2182,6 @@ vxge_hw_vpath_vid_add( 
	struct __vxge_hw_vpath_handle *vpath_handle,

	struct __vxge_hw_vpath_handle *vpath_handle,

	u64			vid);

	u64			vid);





enum vxge_hw_status

vxge_hw_vpath_vid_get(

	struct __vxge_hw_vpath_handle *vpath_handle,

	u64			*vid);



enum vxge_hw_status

enum vxge_hw_status

vxge_hw_vpath_vid_delete(

vxge_hw_vpath_vid_delete(

	struct __vxge_hw_vpath_handle *vpath_handle,

	struct __vxge_hw_vpath_handle *vpath_handle,