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/netatm/uni | |
| 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/netatm/uni')
| -rw-r--r-- | sys/netatm/uni/uniarp.c | 8 | ||||
| -rw-r--r-- | sys/netatm/uni/uniarp_cache.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index bcd0967..c23a905 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -722,7 +722,7 @@ uniarp_client_mode(uip, aap) /* * Next, initiate an SVC to the server */ - if ((*inp->inf_createsvc)(&inp->inf_nif->nif_if, AF_ATM, + if ((*inp->inf_createsvc)(ANIF2IFP(inp->inf_nif), AF_ATM, (caddr_t)&uip->uip_arpsvratm, &ivp)) { uma_zfree(uniarp_zone, uap); UNIIP_ARP_TIMER(uip, 1 * ATM_HZ); @@ -1054,7 +1054,7 @@ uniarp_ioctl(code, data, arg1) AF_INET; SATOSIN(&aar.aap_arp_addr)->sin_addr.s_addr = uap->ua_dstip.s_addr; - strlcpy(aar.aap_intf, nip->nif_if.if_xname, + strlcpy(aar.aap_intf, ANIF2IFP(nip)->if_xname, sizeof(aar.aap_intf)); aar.aap_flags = uap->ua_flags; aar.aap_origin = uap->ua_origin; @@ -1107,7 +1107,7 @@ uniarp_ioctl(code, data, arg1) */ SATOSIN(&aar.aap_arp_addr)->sin_family = AF_INET; SATOSIN(&aar.aap_arp_addr)->sin_addr.s_addr = 0; - strlcpy(aar.aap_intf, nip->nif_if.if_xname, + strlcpy(aar.aap_intf, ANIF2IFP(nip)->if_xname, sizeof(aar.aap_intf)); aar.aap_flags = 0; aar.aap_origin = uap->ua_origin; @@ -1187,7 +1187,7 @@ updbuf: /* * Fill in info to be returned */ - strlcpy(asr.asp_intf, nip->nif_if.if_xname, + strlcpy(asr.asp_intf, ANIF2IFP(nip)->if_xname, sizeof(asr.asp_intf)); asr.asp_state = uip->uip_arpstate; if (uip->uip_arpstate == UIAS_SERVER_ACTIVE) { diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c index 946fee8..074b8c7 100644 --- a/sys/netatm/uni/uniarp_cache.c +++ b/sys/netatm/uni/uniarp_cache.c @@ -413,7 +413,7 @@ uniarp_validate_ip(uip, ip, origin) * Can't be multicast or broadcast address */ if (IN_MULTICAST(ntohl(ip->s_addr)) || - in_broadcast(*ip, &uip->uip_ipnif->inf_nif->nif_if)) + in_broadcast(*ip, ANIF2IFP(uip->uip_ipnif->inf_nif))) return (1); /* |
