summaryrefslogtreecommitdiffstats
path: root/sys/dev/ed/if_ed_sic.c
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2005-06-10 16:49:24 +0000
committerbrooks <brooks@FreeBSD.org>2005-06-10 16:49:24 +0000
commit567ba9b00a248431e7c1147c4e079fd7a11b9ecf (patch)
treef65b6d7834b40dfcd48534829a0a1e9529ab87ee /sys/dev/ed/if_ed_sic.c
parent3eaa67c3ad947d85be5350e0e184cd6ee5b93a52 (diff)
downloadFreeBSD-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/ed/if_ed_sic.c')
-rw-r--r--sys/dev/ed/if_ed_sic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ed/if_ed_sic.c b/sys/dev/ed/if_ed_sic.c
index 808745b..471065f 100644
--- a/sys/dev/ed/if_ed_sic.c
+++ b/sys/dev/ed/if_ed_sic.c
@@ -107,15 +107,14 @@ ed_probe_SIC(device_t dev, int port_rid, int flags)
sum = sc->mem_start[6];
for (i = 0; i < ETHER_ADDR_LEN; i++)
- sum ^= (sc->arpcom.ac_enaddr[i] = sc->mem_start[i]);
+ sum ^= (sc->enaddr[i] = sc->mem_start[i]);
#ifdef ED_DEBUG
device_printf(dev, "ed_probe_sic: got address %6D\n",
- sc->arpcom.ac_enaddr, ":");
+ sc->enaddr, ":");
#endif
if (sum != 0)
return (ENXIO);
- if ((sc->arpcom.ac_enaddr[0] | sc->arpcom.ac_enaddr[1] |
- sc->arpcom.ac_enaddr[2]) == 0)
+ if ((sc->enaddr[0] | sc->enaddr[1] | sc->enaddr[2]) == 0)
return (ENXIO);
sc->vendor = ED_VENDOR_SIC;
OpenPOWER on IntegriCloud