luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ehea: fix port_napi_disable/enable

Browse Source 
napi_disable / napi_enable must be applied on all ehea queues.

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jan-Bernd Themann 2007-10-24 11:53:34 +02:00 committed by Jeff Garzik
parent a40745f5ef
commit 0173b793ca
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ehea/ehea.h
View File

@ -40,7 +40,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ehea" #define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0078" #define DRV_VERSION "EHEA_0079"
/* eHEA capability flags */ /* eHEA capability flags */
#define DLPAR_PORT_ADD_REM 1 #define DLPAR_PORT_ADD_REM 1

7
drivers/net/ehea/ehea_main.c
View File

@ -2329,7 +2329,7 @@ static void port_napi_disable(struct ehea_port *port)
{ {
int i; int i;
for (i = 0; i < port->num_def_qps; i++) for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
napi_disable(&port->port_res[i].napi); napi_disable(&port->port_res[i].napi);
} }
@ -2337,7 +2337,7 @@ static void port_napi_enable(struct ehea_port *port)
{ {
int i; int i;
for (i = 0; i < port->num_def_qps; i++) for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
napi_enable(&port->port_res[i].napi); napi_enable(&port->port_res[i].napi);
} }
@ -2373,8 +2373,6 @@ static int ehea_down(struct net_device *dev)
ehea_drop_multicast_list(dev); ehea_drop_multicast_list(dev);
ehea_free_interrupts(dev); ehea_free_interrupts(dev);
port_napi_disable(port);
port->state = EHEA_PORT_DOWN; port->state = EHEA_PORT_DOWN;
ret = ehea_clean_all_portres(port); ret = ehea_clean_all_portres(port);
@ -2396,6 +2394,7 @@ static int ehea_stop(struct net_device *dev)
flush_scheduled_work(); flush_scheduled_work();
down(&port->port_lock); down(&port->port_lock);
netif_stop_queue(dev); netif_stop_queue(dev);
port_napi_disable(port);
ret = ehea_down(dev); ret = ehea_down(dev);
up(&port->port_lock); up(&port->port_lock);
return ret; return ret;