* [PATCH] net: WIZnet drivers: enable interrupts after napi_complete()
@ 2015-03-10 2:35 Yongbae Park
2015-03-10 4:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Yongbae Park @ 2015-03-10 2:35 UTC (permalink / raw)
To: msink; +Cc: davem, nicolas.ferre, tklauser, wsa, varkabhadram, netdev
The interrupt is enabled before napi_complete(). A network timeout
occurs if the interrupt handler is called before napi_complete().
Fix the bug by enabling the interrupt after napi_complete().
Signed-off-by: Yongbae Park <yongbae2@gmail.com>
---
drivers/net/ethernet/wiznet/w5100.c | 4 ++--
drivers/net/ethernet/wiznet/w5300.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index a495931..43daa6a 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -498,9 +498,9 @@ static int w5100_napi_poll(struct napi_struct *napi, int budget)
}
if (rx_count < budget) {
- w5100_write(priv, W5100_IMR, IR_S0);
- mmiowb();
napi_complete(napi);
+ w5100_write(priv, W5100_IMR, IR_S0);
+ mmiowb();
}
return rx_count;
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 09322d9..4b31000 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -418,9 +418,9 @@ static int w5300_napi_poll(struct napi_struct *napi, int budget)
}
if (rx_count < budget) {
+ napi_complete(napi);
w5300_write(priv, W5300_IMR, IR_S0);
mmiowb();
- napi_complete(napi);
}
return rx_count;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: WIZnet drivers: enable interrupts after napi_complete()
2015-03-10 2:35 [PATCH] net: WIZnet drivers: enable interrupts after napi_complete() Yongbae Park
@ 2015-03-10 4:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-03-10 4:23 UTC (permalink / raw)
To: yongbae2; +Cc: msink, nicolas.ferre, tklauser, wsa, varkabhadram, netdev
From: Yongbae Park <yongbae2@gmail.com>
Date: Tue, 10 Mar 2015 11:35:07 +0900
> The interrupt is enabled before napi_complete(). A network timeout
> occurs if the interrupt handler is called before napi_complete().
>
> Fix the bug by enabling the interrupt after napi_complete().
>
> Signed-off-by: Yongbae Park <yongbae2@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-10 4:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-10 2:35 [PATCH] net: WIZnet drivers: enable interrupts after napi_complete() Yongbae Park
2015-03-10 4:23 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.