@@ -87,7 +87,7 @@ static unsigned int bw_percentage[VXGE_HW_MAX_VIRTUAL_PATHS] =
87
87
module_param_array (bw_percentage , uint , NULL , 0 );
88
88
89
89
static struct vxge_drv_config * driver_config ;
90
- static enum vxge_hw_status vxge_reset_all_vpaths (struct vxgedev * vdev );
90
+ static void vxge_reset_all_vpaths (struct vxgedev * vdev );
91
91
92
92
static inline int is_vxge_card_up (struct vxgedev * vdev )
93
93
{
@@ -1606,7 +1606,6 @@ static void vxge_config_ci_for_tti_rti(struct vxgedev *vdev)
1606
1606
1607
1607
static int do_vxge_reset (struct vxgedev * vdev , int event )
1608
1608
{
1609
- enum vxge_hw_status status ;
1610
1609
int ret = 0 , vp_id , i ;
1611
1610
1612
1611
vxge_debug_entryexit (VXGE_TRACE , "%s:%d" , __func__ , __LINE__ );
@@ -1709,14 +1708,7 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
1709
1708
netif_tx_stop_all_queues (vdev -> ndev );
1710
1709
1711
1710
if (event == VXGE_LL_FULL_RESET ) {
1712
- status = vxge_reset_all_vpaths (vdev );
1713
- if (status != VXGE_HW_OK ) {
1714
- vxge_debug_init (VXGE_ERR ,
1715
- "fatal: %s: can not reset vpaths" ,
1716
- vdev -> ndev -> name );
1717
- ret = - EPERM ;
1718
- goto out ;
1719
- }
1711
+ vxge_reset_all_vpaths (vdev );
1720
1712
}
1721
1713
1722
1714
if (event == VXGE_LL_COMPL_RESET ) {
@@ -1969,9 +1961,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
1969
1961
}
1970
1962
1971
1963
/* reset vpaths */
1972
- static enum vxge_hw_status vxge_reset_all_vpaths (struct vxgedev * vdev )
1964
+ static void vxge_reset_all_vpaths (struct vxgedev * vdev )
1973
1965
{
1974
- enum vxge_hw_status status = VXGE_HW_OK ;
1975
1966
struct vxge_vpath * vpath ;
1976
1967
int i ;
1977
1968
@@ -1986,18 +1977,16 @@ static enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev)
1986
1977
"vxge_hw_vpath_recover_"
1987
1978
"from_reset failed for vpath: "
1988
1979
"%d" , i );
1989
- return status ;
1980
+ return ;
1990
1981
}
1991
1982
} else {
1992
1983
vxge_debug_init (VXGE_ERR ,
1993
1984
"vxge_hw_vpath_reset failed for "
1994
1985
"vpath:%d" , i );
1995
- return status ;
1986
+ return ;
1996
1987
}
1997
1988
}
1998
1989
}
1999
-
2000
- return status ;
2001
1990
}
2002
1991
2003
1992
/* close vpaths */
@@ -2676,11 +2665,7 @@ static int vxge_set_features(struct net_device *dev, netdev_features_t features)
2676
2665
/* !netif_running() ensured by vxge_fix_features() */
2677
2666
2678
2667
vdev -> devh -> config .rth_en = !!(features & NETIF_F_RXHASH );
2679
- if (vxge_reset_all_vpaths (vdev ) != VXGE_HW_OK ) {
2680
- dev -> features = features ^ NETIF_F_RXHASH ;
2681
- vdev -> devh -> config .rth_en = !!(dev -> features & NETIF_F_RXHASH );
2682
- return - EIO ;
2683
- }
2668
+ vxge_reset_all_vpaths (vdev );
2684
2669
2685
2670
return 0 ;
2686
2671
}
0 commit comments