summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSriram <srk@ti.com>2009-11-12 01:55:42 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-15 22:17:43 -0800
commit5bfa2a17f2b79eb6a63c5d47ce89d5798bba086a (patch)
tree8688f103ebcd051adbff13cde2feac2356d45b9f
parentf88c5b9887a95ce424db629ee79b57f6ef5bfddd (diff)
downloadkernel-uprobes-5bfa2a17f2b79eb6a63c5d47ce89d5798bba086a.tar.gz
kernel-uprobes-5bfa2a17f2b79eb6a63c5d47ce89d5798bba086a.tar.xz
kernel-uprobes-5bfa2a17f2b79eb6a63c5d47ce89d5798bba086a.zip
TI Davinci EMAC : Fix Console Hang when bringing the interface down
In the NAPI poll function(emac_poll), check for netif_running() is unnecassary. In addition to associated runtime overhead, it also results in a continuous softirq loop when the interface is brought down under heavy traffic(tested wit Traffic Generator). Once the interface is disabled, the poll function always returns zero(with the check for netif_running) and napi_complete() would never get called resulting in softirq loop. Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Chaithrika U S <chaithrika@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/davinci_emac.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 3179521aee9..db638037947 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2140,9 +2140,6 @@ static int emac_poll(struct napi_struct *napi, int budget)
u32 status = 0;
u32 num_pkts = 0;
- if (!netif_running(ndev))
- return 0;
-
/* Check interrupt vectors and call packet processing */
status = emac_read(EMAC_MACINVECTOR);