diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
commit | fc74a9f93a5fbc83262aa12084404ac953c854b5 (patch) | |
tree | f65b6d7834b40dfcd48534829a0a1e9529ab87ee /usr.sbin | |
parent | 7f1d8b7517a6a93379974243551e0ec0a96cb54e (diff) | |
download | src-fc74a9f93a5fbc83262aa12084404ac953c854b5.tar.gz src-fc74a9f93a5fbc83262aa12084404ac953c854b5.zip |
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
Notes
Notes:
svn path=/head/; revision=147256
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/slstat/slstat.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c index fbe52cfd09fe..ff017f4145e8 100644 --- a/usr.sbin/slstat/slstat.c +++ b/usr.sbin/slstat/slstat.c @@ -192,31 +192,31 @@ intpr() putchar('\n'); } printf("%8lu %6ld %6u %6u %6u", - V(sc_if.if_ibytes), - V(sc_if.if_ipackets), + V(sc_ifp->if_ibytes), + V(sc_ifp->if_ipackets), V(sc_comp.sls_compressedin), V(sc_comp.sls_uncompressedin), V(sc_comp.sls_errorin)); if (vflag) printf(" %6u %6lu %6lu", V(sc_comp.sls_tossed), - V(sc_if.if_ipackets) - + V(sc_ifp->if_ipackets) - V(sc_comp.sls_compressedin) - V(sc_comp.sls_uncompressedin) - V(sc_comp.sls_errorin), - V(sc_if.if_ierrors)); + V(sc_ifp->if_ierrors)); printf(" | %8lu %6ld %6u %6u %6lu", - V(sc_if.if_obytes) / (rflag ? interval : 1), - V(sc_if.if_opackets), + V(sc_ifp->if_obytes) / (rflag ? interval : 1), + V(sc_ifp->if_opackets), V(sc_comp.sls_compressed), V(sc_comp.sls_packets) - V(sc_comp.sls_compressed), - V(sc_if.if_opackets) - V(sc_comp.sls_packets)); + V(sc_ifp->if_opackets) - V(sc_comp.sls_packets)); if (vflag) printf(" %6u %6u %6lu %6lu", V(sc_comp.sls_searches), V(sc_comp.sls_misses), - V(sc_if.if_oerrors), - V(sc_if.if_collisions)); + V(sc_ifp->if_oerrors), + V(sc_ifp->if_collisions)); putchar('\n'); fflush(stdout); line++; |