diff options
| author |   aaron <aaron@openbsd.org> | 2001-06-23 04:01:18 +0000 |
|---|---|---|
| committer | aaron <aaron@openbsd.org> | 2001-06-23 04:01:18 +0000 |
| commit | babe8e96a0bcfd0330dad1ceccd093b794e3ba71 (patch) | |
| tree | 8451a24ed01f35aeb6de077ee1af893c59ee411e | |
| parent | Use DLIST for tags. (diff) | |
| download | wireguard-openbsd-babe8e96a0bcfd0330dad1ceccd093b794e3ba71.tar.xz wireguard-openbsd-babe8e96a0bcfd0330dad1ceccd093b794e3ba71.zip | |
Use standard defined macros to access inner ifnet data structure members.
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 | ||||
| -rw-r--r-- | sys/net/if_vlan.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 78ac06472e8..0d55dd4bd33 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.47 2001/06/15 03:38:33 itojun Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.48 2001/06/23 04:01:18 aaron Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -631,7 +631,7 @@ ether_input(ifp, eh, m) #if NVLAN > 0 if (etype == ETHERTYPE_8021Q) { if (vlan_input(eh, m) < 0) - ifp->if_data.ifi_noproto++; + ifp->if_noproto++; return; } #endif /* NVLAN > 0 */ diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 20894ba9b4c..fde24e51c20 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.18 2001/06/22 14:28:58 deraadt Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.19 2001/06/23 04:01:19 aaron Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology * @@ -170,8 +170,8 @@ vlanattach(void *dummy) ether_ifattach(ifp); /* Now undo some of the damage... */ - ifp->if_data.ifi_type = IFT_8021_VLAN; - ifp->if_data.ifi_hdrlen = EVL_ENCAPLEN; + ifp->if_type = IFT_8021_VLAN; + ifp->if_hdrlen = EVL_ENCAPLEN; } } @@ -407,7 +407,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p) struct ifaddr *ifa1, *ifa2; struct sockaddr_dl *sdl1, *sdl2; - if (p->if_data.ifi_type != IFT_ETHER) + if (p->if_type != IFT_ETHER) return EPROTONOSUPPORT; if (ifv->ifv_p) return EBUSY; |