diff options
author | luigi <luigi@FreeBSD.org> | 2004-04-24 22:24:48 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2004-04-24 22:24:48 +0000 |
commit | 62793e142c94978239d4b6e11e9949130e4c3558 (patch) | |
tree | 84d208d9dd7d9f36600788f79bf76a1ded7598fa /sys | |
parent | 3a8abc28c71571f64f0c8f164fc61607842587d0 (diff) | |
download | FreeBSD-src-62793e142c94978239d4b6e11e9949130e4c3558.zip FreeBSD-src-62793e142c94978239d4b6e11e9949130e4c3558.tar.gz |
arpcom untangling:
consistently with the rest of the code, use IFP2AC(ifp) to access
the arpcom structure given the ifp.
In this case also fix a difference in assumptions WRT the rest of
the net/ sources: it is not the 'struct *softc' that starts with a
'struct arpcom', but a 'struct arpcom' that starts with a
'struct ifnet'
Diffstat (limited to 'sys')
-rw-r--r-- | sys/net/if.c | 4 | ||||
-rw-r--r-- | sys/net/if_vlan.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 920eec4..3830c18 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -319,7 +319,7 @@ if_findindex(struct ifnet *ifp) case IFT_ISO88025: case IFT_L2VLAN: snprintf(eaddr, 18, "%6D", - ((struct arpcom *)ifp->if_softc)->ac_enaddr, ":"); + IFP2AC(ifp)->ac_enaddr, ":"); break; default: eaddr[0] = '\0'; @@ -1979,7 +1979,7 @@ if_setlladdr(struct ifnet *ifp, const u_char *lladdr, int len) case IFT_XETHER: case IFT_ISO88025: case IFT_L2VLAN: - bcopy(lladdr, ((struct arpcom *)ifp->if_softc)->ac_enaddr, len); + bcopy(lladdr, IFP2AC(ifp)->ac_enaddr, len); /* * XXX We also need to store the lladdr in LLADDR(sdl), * which is done below. This is a pain because we must diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 315412f..87eabb7 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -691,7 +691,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) struct sockaddr *sa; sa = (struct sockaddr *) &ifr->ifr_data; - bcopy(((struct arpcom *)ifp->if_softc)->ac_enaddr, + bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t) sa->sa_data, ETHER_ADDR_LEN); } break; |