diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-06-13 23:19:18 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-06-13 23:19:18 +0000 |
| commit | f5c8be48ee0c293957d240b9e2e69689630d86ee (patch) | |
| tree | 66125a75af892b77f48e4f9ea77bf6c67408bb4a /sys/dev/pci/if_fxp_pci.c | |
| parent | 729720c4255908257e88572bd15738e3e890d1e5 (diff) | |
From NetBSD, 82562 requires a nop before a resume (tested by mickey)
Diffstat (limited to 'sys/dev/pci/if_fxp_pci.c')
| -rw-r--r-- | sys/dev/pci/if_fxp_pci.c | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 7c34c0792c7..68ad759e4c1 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.5 2000/12/29 14:03:01 art Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.6 2001/06/13 23:19:16 jason Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -58,21 +58,6 @@ #include <netinet/ip.h> #endif -#ifdef IPX -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> -#endif - -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - -#if NBPFILTER > 0 -#include <net/bpf.h> -#include <net/bpfdesc.h> -#endif - #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> @@ -173,13 +158,21 @@ fxp_pci_attach(parent, self, aux) return; } - /* - * revisions - * 2 = 82557 - * 4-6 = 82558 - * 8 = 82559 - */ - sc->not_82557 = (rev >= 4) ? 1 : 0; + switch (PCI_PRODUCT(pa->pa_id)) { + case PCI_PRODUCT_INTEL_82562: + sc->sc_flags |= FXPF_HAS_RESUME_BUG; + sc->not_82557 = 1; + break; + default: + /* + * revisions + * 2 = 82557 + * 4-6 = 82558 + * 8 = 82559 + */ + sc->not_82557 = (rev >= 4) ? 1 : 0; + break; + } /* Do generic parts of attach. */ if (fxp_attach_common(sc, enaddr, intrstr)) { |