diff options
| -rw-r--r-- | sys/net/if.c | 3 | ||||
| -rw-r--r-- | sys/net/if_pppoe.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 3 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 32385b40352..8b06554355e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.289 2014/05/16 08:21:54 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.290 2014/06/07 11:04:14 henning Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1608,7 +1608,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) 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); diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index 54a3ec8ee62..da5341d5256 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.38 2014/04/14 09:06:42 mpi Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.39 2014/06/07 11:04:14 henning Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -924,9 +924,7 @@ pppoe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data) 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); } diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 450e83b1c0e..185d80ea5f7 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.117 2014/05/15 09:05:13 mpi Exp $ */ +/* $OpenBSD: nd6.c,v 1.118 2014/06/07 11:04:14 henning Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -1824,7 +1824,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? */ diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 729c959ea27..04981ba73f1 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.78 2014/04/18 10:48:30 jca Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.79 2014/06/07 11:04:14 henning Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -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: |