diff options
| author | David S. Miller <[email protected]> | 2008-04-25 07:31:07 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2008-04-25 07:31:07 +0000 |
| commit | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch) | |
| tree | bdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/typhoon.c | |
| parent | xfrm: alg_key_len & alg_icv_len should be unsigned (diff) | |
| parent | [netdrvr] tehuti: move ioctl perm check closer to function start (diff) | |
| download | kernel-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.tar.gz kernel-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 333961bb7873..c0dd25ba7a18 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -2183,7 +2183,6 @@ typhoon_resume(struct pci_dev *pdev) } netif_device_attach(dev); - netif_start_queue(dev); return 0; reset: |