summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Rizzo <luigi@FreeBSD.org>2004-04-24 22:24:48 +0000
committerLuigi Rizzo <luigi@FreeBSD.org>2004-04-24 22:24:48 +0000
commit3fefbff0c29b92d03414e87f25c846b93a8ee3b1 (patch)
tree84d208d9dd7d9f36600788f79bf76a1ded7598fa
parent56f70627286d026ed6b2386007e36fc593e1d584 (diff)
Notes
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_vlan.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index 920eec46ede5..3830c18c7986 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 315412ffbb70..87eabb7eb68b 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;