don't kill the define, since this is userland visible, but there is
never ever an interface in our kernel with if_type == IFT_L2VLAN - see
my commit from 2 weeks ago or so. To clarify this once again, I didn't
remove the L2VLAN use, it was never really used.
ok?
Index: net/if.c
===================================================================
RCS file: /cvs/src/sys/net/if.c,v
retrieving revision 1.288
diff -u -p -r1.288 if.c
--- net/if.c 13 May 2014 14:33:25 -0000 1.288
+++ net/if.c 14 May 2014 21:41:01 -0000
@@ -1625,7 +1625,6 @@ ifioctl(struct socket *so, u_long cmd, c
case IFT_CARP:
case IFT_XETHER:
case IFT_ISO88025:
- case IFT_L2VLAN:
bcopy((caddr_t)ifr->ifr_addr.sa_data,
(caddr_t)((struct arpcom *)ifp)->ac_enaddr,
ETHER_ADDR_LEN);
Index: net/if_pppoe.c
===================================================================
RCS file: /cvs/src/sys/net/if_pppoe.c,v
retrieving revision 1.38
diff -u -p -r1.38 if_pppoe.c
--- net/if_pppoe.c 14 Apr 2014 09:06:42 -0000 1.38
+++ net/if_pppoe.c 24 Apr 2014 23:38:10 -0000
@@ -924,9 +924,7 @@ pppoe_ioctl(struct ifnet *ifp, unsigned
struct ifnet *eth_if;
eth_if = ifunit(parms->eth_ifname);
- if (eth_if == NULL ||
- (eth_if->if_type != IFT_ETHER &&
- eth_if->if_type != IFT_L2VLAN)) {
+ if (eth_if == NULL || eth_if->if_type != IFT_ETHER) {
sc->sc_eth_if = NULL;
return (ENXIO);
}
Index: netinet6/nd6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/nd6.c,v
retrieving revision 1.116
diff -u -p -r1.116 nd6.c
--- netinet6/nd6.c 7 May 2014 08:14:59 -0000 1.116
+++ netinet6/nd6.c 13 May 2014 14:38:16 -0000
@@ -1830,7 +1830,6 @@ nd6_need_cache(struct ifnet *ifp)
case IFT_ETHER:
case IFT_IEEE1394:
case IFT_PROPVIRTUAL:
- case IFT_L2VLAN:
case IFT_IEEE80211:
case IFT_CARP:
case IFT_GIF: /* XXX need more cases? */
Index: netinet6/nd6_nbr.c
===================================================================
RCS file: /cvs/src/sys/netinet6/nd6_nbr.c,v
retrieving revision 1.78
diff -u -p -r1.78 nd6_nbr.c
--- netinet6/nd6_nbr.c 18 Apr 2014 10:48:30 -0000 1.78
+++ netinet6/nd6_nbr.c 24 Apr 2014 23:38:10 -0000
@@ -1064,7 +1064,6 @@ nd6_ifptomac(struct ifnet *ifp)
case IFT_IEEE1394:
case IFT_PROPVIRTUAL:
case IFT_CARP:
- case IFT_L2VLAN:
case IFT_IEEE80211:
return ((caddr_t)(ifp + 1));
default:
--
Henning Brauer, h...@bsws.de, henn...@openbsd.org
BS Web Services GmbH, http://bsws.de, Full-Service ISP
Secure Hosting, Mail and DNS. Virtual & Dedicated Servers, Root to Fully Managed
Henning Brauer Consulting, http://henningbrauer.com/
