d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arpcom untangling:

Browse Source 
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'
This commit is contained in:
Luigi Rizzo 2004-04-24 22:24:48 +00:00
parent 56f7062728
commit 3fefbff0c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if.c
View File

@ -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

2
sys/net/if_vlan.c
View File

@ -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;