aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2014-01-15 11:28:54 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-16 19:22:54 -0500
commite40c10fc8973ccd6a451a84dd30f16e5c1cd070c (patch)
tree6051d65b996c9e2c9ce90bdbd621b5e112d08731 /drivers/net/ethernet/neterion
parent2fd888a5e7b8fc1f1d496fa5379103d667852859 (diff)
vxge: make local functions static
Remove unused function vxge_hw_vpath_vid_get Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-config.c2
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.c3
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.h1
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-traffic.c37
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-traffic.h8
5 files changed, 5 insertions, 46 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
index fbe5363cb89c..089b713b9f7b 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
@@ -2148,7 +2148,7 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh,
2148 * __vxge_hw_ring_replenish - Initial replenish of RxDs 2148 * __vxge_hw_ring_replenish - Initial replenish of RxDs
2149 * This function replenishes the RxDs from reserve array to work array 2149 * This function replenishes the RxDs from reserve array to work array
2150 */ 2150 */
2151enum vxge_hw_status 2151static enum vxge_hw_status
2152vxge_hw_ring_replenish(struct __vxge_hw_ring *ring) 2152vxge_hw_ring_replenish(struct __vxge_hw_ring *ring)
2153{ 2153{
2154 void *rxd; 2154 void *rxd;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 6eae2168fff9..1ded50ca1600 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -87,6 +87,7 @@ static unsigned int bw_percentage[VXGE_HW_MAX_VIRTUAL_PATHS] =
87module_param_array(bw_percentage, uint, NULL, 0); 87module_param_array(bw_percentage, uint, NULL, 0);
88 88
89static struct vxge_drv_config *driver_config; 89static struct vxge_drv_config *driver_config;
90static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
90 91
91static inline int is_vxge_card_up(struct vxgedev *vdev) 92static inline int is_vxge_card_up(struct vxgedev *vdev)
92{ 93{
@@ -1971,7 +1972,7 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
1971} 1972}
1972 1973
1973/* reset vpaths */ 1974/* reset vpaths */
1974enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev) 1975static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
1975{ 1976{
1976 enum vxge_hw_status status = VXGE_HW_OK; 1977 enum vxge_hw_status status = VXGE_HW_OK;
1977 struct vxge_vpath *vpath; 1978 struct vxge_vpath *vpath;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
index 36ca40f8f249..3a79d93b8445 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h
@@ -427,7 +427,6 @@ void vxge_os_timer(struct timer_list *timer, void (*func)(unsigned long data),
427} 427}
428 428
429void vxge_initialize_ethtool_ops(struct net_device *ndev); 429void vxge_initialize_ethtool_ops(struct net_device *ndev);
430enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
431int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override); 430int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);
432 431
433/* #define VXGE_DEBUG_INIT: debug for initialization functions 432/* #define VXGE_DEBUG_INIT: debug for initialization functions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
index 99749bd07d72..9e1aaa7f36bb 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
@@ -1956,8 +1956,7 @@ exit:
1956 * @vid: vlan id to be added for this vpath into the list 1956 * @vid: vlan id to be added for this vpath into the list
1957 * 1957 *
1958 * Adds the given vlan id into the list for this vpath. 1958 * Adds the given vlan id into the list for this vpath.
1959 * see also: vxge_hw_vpath_vid_delete, vxge_hw_vpath_vid_get and 1959 * see also: vxge_hw_vpath_vid_delete
1960 * vxge_hw_vpath_vid_get_next
1961 * 1960 *
1962 */ 1961 */
1963enum vxge_hw_status 1962enum vxge_hw_status
@@ -1979,45 +1978,13 @@ exit:
1979} 1978}
1980 1979
1981/** 1980/**
1982 * vxge_hw_vpath_vid_get - Get the first vid entry for this vpath
1983 * from vlan id table.
1984 * @vp: Vpath handle.
1985 * @vid: Buffer to return vlan id
1986 *
1987 * Returns the first vlan id in the list for this vpath.
1988 * see also: vxge_hw_vpath_vid_get_next
1989 *
1990 */
1991enum vxge_hw_status
1992vxge_hw_vpath_vid_get(struct __vxge_hw_vpath_handle *vp, u64 *vid)
1993{
1994 u64 data;
1995 enum vxge_hw_status status = VXGE_HW_OK;
1996
1997 if (vp == NULL) {
1998 status = VXGE_HW_ERR_INVALID_HANDLE;
1999 goto exit;
2000 }
2001
2002 status = __vxge_hw_vpath_rts_table_get(vp,
2003 VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_LIST_FIRST_ENTRY,
2004 VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_VID,
2005 0, vid, &data);
2006
2007 *vid = VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_VLAN_ID(*vid);
2008exit:
2009 return status;
2010}
2011
2012/**
2013 * vxge_hw_vpath_vid_delete - Delete the vlan id entry for this vpath 1981 * vxge_hw_vpath_vid_delete - Delete the vlan id entry for this vpath
2014 * to vlan id table. 1982 * to vlan id table.
2015 * @vp: Vpath handle. 1983 * @vp: Vpath handle.
2016 * @vid: vlan id to be added for this vpath into the list 1984 * @vid: vlan id to be added for this vpath into the list
2017 * 1985 *
2018 * Adds the given vlan id into the list for this vpath. 1986 * Adds the given vlan id into the list for this vpath.
2019 * see also: vxge_hw_vpath_vid_add, vxge_hw_vpath_vid_get and 1987 * see also: vxge_hw_vpath_vid_add
2020 * vxge_hw_vpath_vid_get_next
2021 * 1988 *
2022 */ 1989 */
2023enum vxge_hw_status 1990enum vxge_hw_status
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
index 4a518a3b131c..ba6f833bb059 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
@@ -1918,9 +1918,6 @@ vxge_hw_ring_rxd_post_post(
1918 struct __vxge_hw_ring *ring_handle, 1918 struct __vxge_hw_ring *ring_handle,
1919 void *rxdh); 1919 void *rxdh);
1920 1920
1921enum vxge_hw_status
1922vxge_hw_ring_replenish(struct __vxge_hw_ring *ring_handle);
1923
1924void 1921void
1925vxge_hw_ring_rxd_post_post_wmb( 1922vxge_hw_ring_rxd_post_post_wmb(
1926 struct __vxge_hw_ring *ring_handle, 1923 struct __vxge_hw_ring *ring_handle,
@@ -2186,11 +2183,6 @@ vxge_hw_vpath_vid_add(
2186 u64 vid); 2183 u64 vid);
2187 2184
2188enum vxge_hw_status 2185enum vxge_hw_status
2189vxge_hw_vpath_vid_get(
2190 struct __vxge_hw_vpath_handle *vpath_handle,
2191 u64 *vid);
2192
2193enum vxge_hw_status
2194vxge_hw_vpath_vid_delete( 2186vxge_hw_vpath_vid_delete(
2195 struct __vxge_hw_vpath_handle *vpath_handle, 2187 struct __vxge_hw_vpath_handle *vpath_handle,
2196 u64 vid); 2188 u64 vid);