From db7fbcef6927e4e4807e3f217599f74b18b21685 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Fri, 14 Jan 2011 03:02:38 +0000 Subject: [PATCH] --- yaml --- r: 231236 b: refs/heads/master c: bbe9e637330abe55442aebe799425e224086959f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4a72c2680c6d..6199ae57aa60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad4650a89ac47bd153cbb76c3fd6eb1fa6f315b7 +refs/heads/master: bbe9e637330abe55442aebe799425e224086959f diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index 1c2dbdb43631..b307696e0f63 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/drivers/net/greth.c @@ -356,6 +356,8 @@ static int greth_open(struct net_device *dev) dev_dbg(&dev->dev, " starting queue\n"); netif_start_queue(dev); + GRETH_REGSAVE(greth->regs->status, 0xFF); + napi_enable(&greth->napi); greth_enable_irqs(greth); @@ -371,7 +373,9 @@ static int greth_close(struct net_device *dev) napi_disable(&greth->napi); + greth_disable_irqs(greth); greth_disable_tx(greth); + greth_disable_rx(greth); netif_stop_queue(dev);