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/dev/de/if_devar.h | |
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/dev/de/if_devar.h')
-rw-r--r-- | sys/dev/de/if_devar.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h index ee02be5..54ed8d6 100644 --- a/sys/dev/de/if_devar.h +++ b/sys/dev/de/if_devar.h @@ -521,7 +521,8 @@ struct tulip_softc { unsigned int tulip_rxmaps_free; #endif #endif - struct arpcom tulip_ac; /* XXX should be at start */ + struct ifnet *tulip_ifp; + u_char tulip_enaddr[6]; bus_space_tag_t tulip_csrs_bst; bus_space_handle_t tulip_csrs_bsh; tulip_regfile_t tulip_csrs; @@ -584,9 +585,6 @@ struct tulip_softc { tulip_desc_t *tulip_rxdescs; tulip_desc_t *tulip_txdescs; }; -#define tulip_if tulip_ac.ac_if -#define tulip_xname tulip_if.if_xname -#define tulip_enaddr tulip_ac.ac_enaddr #define tulip_curperfstats tulip_perfstats[TULIP_PERF_CURRENT] #define tulip_probe_count tulip_probe.probe_count |