net: WIZnet drivers: enable interrupts after napi_complete()

yongbae · davem330 · commit 5a3dba7a5fcc · 2015-03-10T00:22:54.000-04:00
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 &lt;yongbae2@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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) {
+		napi_complete(napi);
 		w5100_write(priv, W5100_IMR, IR_S0);
 		mmiowb();
-		napi_complete(napi);
 	}
 
 	return rx_count;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -498,9 +498,9 @@ static int w5100_napi_poll(struct napi_struct *napi, int budget)`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`if (rx_count < budget) {`
	`501`	`+ napi_complete(napi);`
`501`	`502`	`w5100_write(priv, W5100_IMR, IR_S0);`
`502`	`503`	`mmiowb();`
`503`		`- napi_complete(napi);`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`return rx_count;`
Original file line number	Diff line number	Diff line change
`@@ -418,9 +418,9 @@ static int w5300_napi_poll(struct napi_struct *napi, int budget)`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`if (rx_count < budget) {`
	`421`	`+ napi_complete(napi);`
`421`	`422`	`w5300_write(priv, W5300_IMR, IR_S0);`
`422`	`423`	`mmiowb();`
`423`		`- napi_complete(napi);`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`return rx_count;`