OSDN Git Service

net: WIZnet drivers: enable interrupts after napi_complete()
authorYongbae Park <yongbae2@gmail.com>
Tue, 10 Mar 2015 02:35:07 +0000 (11:35 +0900)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 04:22:54 +0000 (00:22 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/wiznet/w5100.c
drivers/net/ethernet/wiznet/w5300.c

index a495931..0e0fbb5 100644 (file)
@@ -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;
index 09322d9..4b31000 100644 (file)
@@ -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;