diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/davinci_emac.c | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 79ce8e857eab..8edac8915ea8 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
| @@ -2136,9 +2136,6 @@ static int emac_poll(struct napi_struct *napi, int budget) | |||
| 2136 | u32 status = 0; | 2136 | u32 status = 0; |
| 2137 | u32 num_pkts = 0; | 2137 | u32 num_pkts = 0; |
| 2138 | 2138 | ||
| 2139 | if (!netif_running(ndev)) | ||
| 2140 | return 0; | ||
| 2141 | |||
| 2142 | /* Check interrupt vectors and call packet processing */ | 2139 | /* Check interrupt vectors and call packet processing */ |
| 2143 | status = emac_read(EMAC_MACINVECTOR); | 2140 | status = emac_read(EMAC_MACINVECTOR); |
| 2144 | 2141 | ||