Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move bpfattach() call into hpattach().

Browse Source
This commit is contained in:
mycroft 1993-04-30 23:44:03 +00:00
parent b64b1fd758
commit c3c6f70cea
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/i386/isa/if_hp.c
View File

@ -115,9 +115,6 @@ struct hp_softc
#define ns_addr ns_ac.ac_enaddr /* hardware Ethernet address */ #define ns_addr ns_ac.ac_enaddr /* hardware Ethernet address */
int ns_flags; int ns_flags;
#define DSF_LOCK 1 /* block re-entering enstart */ #define DSF_LOCK 1 /* block re-entering enstart */
#if NBPFILTER > 0
#define DSF_ATTACHED 2
#endif
int ns_oactive; int ns_oactive;
int ns_mask; int ns_mask;
struct prhdr ns_ph; /* hardware header of incoming packet*/ struct prhdr ns_ph; /* hardware header of incoming packet*/
@ -417,9 +414,8 @@ hpattach (dvp)
ifp->if_watchdog = 0; ifp->if_watchdog = 0;
if_attach (ifp); if_attach (ifp);
#if NBPFILTER > 0 bpfattach (&ns->ns_bpf, ifp, DLT_EN10MB,
ns->ns_flags &= ~DSF_ATTACHED; sizeof (struct ether_header));
#endif
} }
/* /*
@ -436,15 +432,6 @@ hpinit (unit)
char *cp; char *cp;
register hpc = ns->ns_port; register hpc = ns->ns_port;
#if NBPFILTER > 0
if ((ns->ns_flags & DSF_ATTACHED) == 0)
{
bpfattach (&ns->ns_bpf, ifp, DLT_EN10MB,
sizeof (struct ether_header));
ns->ns_flags |= DSF_ATTACHED;
}
#endif
if (ifp->if_addrlist == (struct ifaddr *) 0) if (ifp->if_addrlist == (struct ifaddr *) 0)
return; return;
if (ifp->if_flags & IFF_RUNNING) if (ifp->if_flags & IFF_RUNNING)

17
sys/dev/isa/if_hp.c
View File

@ -115,9 +115,6 @@ struct hp_softc
#define ns_addr ns_ac.ac_enaddr /* hardware Ethernet address */ #define ns_addr ns_ac.ac_enaddr /* hardware Ethernet address */
int ns_flags; int ns_flags;
#define DSF_LOCK 1 /* block re-entering enstart */ #define DSF_LOCK 1 /* block re-entering enstart */
#if NBPFILTER > 0
#define DSF_ATTACHED 2
#endif
int ns_oactive; int ns_oactive;
int ns_mask; int ns_mask;
struct prhdr ns_ph; /* hardware header of incoming packet*/ struct prhdr ns_ph; /* hardware header of incoming packet*/
@ -417,9 +414,8 @@ hpattach (dvp)
ifp->if_watchdog = 0; ifp->if_watchdog = 0;
if_attach (ifp); if_attach (ifp);
#if NBPFILTER > 0 bpfattach (&ns->ns_bpf, ifp, DLT_EN10MB,
ns->ns_flags &= ~DSF_ATTACHED; sizeof (struct ether_header));
#endif
} }
/* /*
@ -436,15 +432,6 @@ hpinit (unit)
char *cp; char *cp;
register hpc = ns->ns_port; register hpc = ns->ns_port;
#if NBPFILTER > 0
if ((ns->ns_flags & DSF_ATTACHED) == 0)
{
bpfattach (&ns->ns_bpf, ifp, DLT_EN10MB,
sizeof (struct ether_header));
ns->ns_flags |= DSF_ATTACHED;
}
#endif
if (ifp->if_addrlist == (struct ifaddr *) 0) if (ifp->if_addrlist == (struct ifaddr *) 0)
return; return;
if (ifp->if_flags & IFF_RUNNING) if (ifp->if_flags & IFF_RUNNING)