evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: Change enable/disable to wait forever

Browse source 
I don't see why the server should stop responding, or that we should just
give up if it does.  Wait forever when enabling/disabling the visornic

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Neil Horman 2015-07-21 09:55:43 -04:00 • committed by Greg Kroah-Hartman
parent ace72eef40
commit 0c677e9c24
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/unisys/visornic/visornic_main.c
View file

@ -28,7 +28,7 @@
#include "visorbus.h" #include "visorbus.h"
#include "iochannel.h" #include "iochannel.h"
#define VISORNIC_INFINITE_RESPONSE_WAIT 0 #define VISORNIC_INFINITE_RSP_WAIT 0
#define VISORNICSOPENMAX 32 #define VISORNICSOPENMAX 32
#define MAXDEVICES 16384 #define MAXDEVICES 16384
@ -549,7 +549,7 @@ visornic_disable_with_timeout(struct net_device *netdev, const int timeout)
* when it gets a disable. * when it gets a disable.
*/ */
spin_lock_irqsave(&devdata->priv_lock, flags); spin_lock_irqsave(&devdata->priv_lock, flags);
while ((timeout == VISORNIC_INFINITE_RESPONSE_WAIT) || while ((timeout == VISORNIC_INFINITE_RSP_WAIT) ||
(wait < timeout)) { (wait < timeout)) {
if (devdata->enab_dis_acked) if (devdata->enab_dis_acked)
break; break;
@ -686,7 +686,7 @@ visornic_enable_with_timeout(struct net_device *netdev, const int timeout)
send_enbdis(netdev, 1, devdata); send_enbdis(netdev, 1, devdata);
spin_lock_irqsave(&devdata->priv_lock, flags); spin_lock_irqsave(&devdata->priv_lock, flags);
while ((timeout == VISORNIC_INFINITE_RESPONSE_WAIT) || while ((timeout == VISORNIC_INFINITE_RSP_WAIT) ||
(wait < timeout)) { (wait < timeout)) {
if (devdata->enab_dis_acked) if (devdata->enab_dis_acked)
break; break;
@ -731,11 +731,13 @@ visornic_timeout_reset(struct work_struct *work)
netdev = devdata->netdev; netdev = devdata->netdev;
netif_stop_queue(netdev); netif_stop_queue(netdev);
response = visornic_disable_with_timeout(netdev, 100); response = visornic_disable_with_timeout(netdev,
VISORNIC_INFINITE_RSP_WAIT);
if (response) if (response)
goto call_serverdown; goto call_serverdown;
response = visornic_enable_with_timeout(netdev, 100); response = visornic_enable_with_timeout(netdev,
VISORNIC_INFINITE_RSP_WAIT);
if (response) if (response)
goto call_serverdown; goto call_serverdown;
netif_wake_queue(netdev); netif_wake_queue(netdev);
@ -756,7 +758,7 @@ call_serverdown:
static int static int
visornic_open(struct net_device *netdev) visornic_open(struct net_device *netdev)
{ {
visornic_enable_with_timeout(netdev, VISORNIC_INFINITE_RESPONSE_WAIT); visornic_enable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT);
/* start the interface's transmit queue, allowing it to accept /* start the interface's transmit queue, allowing it to accept
* packets for transmission * packets for transmission
@ -777,7 +779,7 @@ static int
visornic_close(struct net_device *netdev) visornic_close(struct net_device *netdev)
{ {
netif_stop_queue(netdev); netif_stop_queue(netdev);
visornic_disable_with_timeout(netdev, VISORNIC_INFINITE_RESPONSE_WAIT); visornic_disable_with_timeout(netdev, VISORNIC_INFINITE_RSP_WAIT);
return 0; return 0;
} }