diff options
author | brooks <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
commit | 567ba9b00a248431e7c1147c4e079fd7a11b9ecf (patch) | |
tree | f65b6d7834b40dfcd48534829a0a1e9529ab87ee /sys/contrib/pf/net | |
parent | 3eaa67c3ad947d85be5350e0e184cd6ee5b93a52 (diff) | |
download | FreeBSD-src-567ba9b00a248431e7c1147c4e079fd7a11b9ecf.zip FreeBSD-src-567ba9b00a248431e7c1147c4e079fd7a11b9ecf.tar.gz |
Stop embedding struct ifnet at the top of driver softcs. Instead the
struct ifnet or the layer 2 common structure it was embedded in have
been replaced with a struct ifnet pointer to be filled by a call to the
new function, if_alloc(). The layer 2 common structure is also allocated
via if_alloc() based on the interface type. It is hung off the new
struct ifnet member, if_l2com.
This change removes the size of these structures from the kernel ABI and
will allow us to better manage them as interfaces come and go.
Other changes of note:
- Struct arpcom is no longer referenced in normal interface code.
Instead the Ethernet address is accessed via the IFP2ENADDR() macro.
To enforce this ac_enaddr has been renamed to _ac_enaddr.
- The second argument to ether_ifattach is now always the mac address
from driver private storage rather than sometimes being ac_enaddr.
Reviewed by: sobomax, sam
Diffstat (limited to 'sys/contrib/pf/net')
-rw-r--r-- | sys/contrib/pf/net/if_pflog.c | 10 | ||||
-rw-r--r-- | sys/contrib/pf/net/if_pflog.h | 4 | ||||
-rw-r--r-- | sys/contrib/pf/net/if_pfsync.c | 9 | ||||
-rw-r--r-- | sys/contrib/pf/net/if_pfsync.h | 4 |
4 files changed, 21 insertions, 6 deletions
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c index 77b0794..ed5cf13 100644 --- a/sys/contrib/pf/net/if_pflog.c +++ b/sys/contrib/pf/net/if_pflog.c @@ -127,7 +127,7 @@ extern int ifqmaxlen; #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFLOG, PFLOGNAME, "Packet Filter Logging Interface"); static LIST_HEAD(pflog_list, pflog_softc) pflog_list; -#define SCP2IFP(sc) (&(sc)->sc_if) +#define SCP2IFP(sc) ((sc)->sc_ifp) IFC_SIMPLE_DECLARE(pflog, 1); static void @@ -144,6 +144,7 @@ pflog_clone_destroy(struct ifnet *ifp) bpfdetach(ifp); if_detach(ifp); + if_free(ifp); LIST_REMOVE(sc, sc_next); free(sc, M_PFLOG); } @@ -155,14 +156,17 @@ pflog_clone_create(struct if_clone *ifc, int unit) struct ifnet *ifp; MALLOC(sc, struct pflog_softc *, sizeof(*sc), M_PFLOG, M_WAITOK|M_ZERO); + ifp = sc->sc_ifp = if_alloc(IFT_PFLOG); + if (ifp == NULL) { + free(sc, M_PFLOG); + return (ENOSPC); + } - ifp = SCP2IFP(sc); if_initname(ifp, ifc->ifc_name, unit); ifp->if_mtu = PFLOGMTU; ifp->if_ioctl = pflogioctl; ifp->if_output = pflogoutput; ifp->if_start = pflogstart; - ifp->if_type = IFT_PFLOG; ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_hdrlen = PFLOG_HDRLEN; ifp->if_softc = sc; diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h index 157dd35..68560e4 100644 --- a/sys/contrib/pf/net/if_pflog.h +++ b/sys/contrib/pf/net/if_pflog.h @@ -30,9 +30,11 @@ #define _NET_IF_PFLOG_H_ struct pflog_softc { - struct ifnet sc_if; /* the interface */ #ifdef __FreeBSD__ + struct ifnet *sc_ifp; /* the interface */ LIST_ENTRY(pflog_softc) sc_next; +#else + struct ifnet sc_if; /* the interface */ #endif }; diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c index c40e564..746a6ea 100644 --- a/sys/contrib/pf/net/if_pfsync.c +++ b/sys/contrib/pf/net/if_pfsync.c @@ -161,7 +161,7 @@ extern int hz; #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFSYNC, PFSYNCNAME, "Packet Filter State Sync. Interface"); static LIST_HEAD(pfsync_list, pfsync_softc) pfsync_list; -#define SCP2IFP(sc) (&(sc)->sc_if) +#define SCP2IFP(sc) ((sc)->sc_ifp) IFC_SIMPLE_DECLARE(pfsync, 1); static void @@ -178,6 +178,7 @@ pfsync_clone_destroy(struct ifnet *ifp) bpfdetach(ifp); #endif if_detach(ifp); + if_free(ifp); LIST_REMOVE(sc, sc_next); free(sc, M_PFSYNC); } @@ -190,6 +191,11 @@ pfsync_clone_create(struct if_clone *ifc, int unit) MALLOC(sc, struct pfsync_softc *, sizeof(*sc), M_PFSYNC, M_WAITOK|M_ZERO); + ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC); + if (ifp == NULL) { + free(sc, M_PFSYNC); + return (ENOSPC); + } pfsync_sync_ok = 1; sc->sc_mbuf = NULL; @@ -206,7 +212,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = pfsyncioctl; ifp->if_output = pfsyncoutput; ifp->if_start = pfsyncstart; - ifp->if_type = IFT_PFSYNC; ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_hdrlen = PFSYNC_HDRLEN; ifp->if_baudrate = IF_Mbps(100); diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/contrib/pf/net/if_pfsync.h index e54696b..4a52195 100644 --- a/sys/contrib/pf/net/if_pfsync.h +++ b/sys/contrib/pf/net/if_pfsync.h @@ -147,7 +147,11 @@ union sc_statep { extern int pfsync_sync_ok; struct pfsync_softc { +#ifdef __FreeBSD__ + struct ifnet *sc_ifp; +#else struct ifnet sc_if; +#endif struct ifnet *sc_sync_ifp; struct ip_moptions sc_imo; |