diff options
-rw-r--r-- | sys/net/if_etherip.c | 3 | ||||
-rw-r--r-- | sys/net/if_gif.c | 3 | ||||
-rw-r--r-- | sys/net/if_loop.c | 3 | ||||
-rw-r--r-- | sys/net/if_mpe.c | 3 | ||||
-rw-r--r-- | sys/net/if_mpw.c | 3 | ||||
-rw-r--r-- | sys/net/if_pair.c | 3 | ||||
-rw-r--r-- | sys/net/if_ppp.c | 3 | ||||
-rw-r--r-- | sys/net/if_pppoe.c | 3 | ||||
-rw-r--r-- | sys/net/if_pppx.c | 3 | ||||
-rw-r--r-- | sys/net/if_trunk.c | 3 | ||||
-rw-r--r-- | sys/net/if_tun.c | 3 | ||||
-rw-r--r-- | sys/net/if_var.h | 3 | ||||
-rw-r--r-- | sys/net/if_vether.c | 3 | ||||
-rw-r--r-- | sys/net/if_vlan.c | 3 | ||||
-rw-r--r-- | sys/net/if_vxlan.c | 3 | ||||
-rw-r--r-- | sys/netinet/ip_carp.c | 3 |
16 files changed, 16 insertions, 32 deletions
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c index 4c947dd9bee..ad58c5208c5 100644 --- a/sys/net/if_etherip.c +++ b/sys/net/if_etherip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_etherip.c,v 1.6 2016/03/04 22:38:23 sashan Exp $ */ +/* $OpenBSD: if_etherip.c,v 1.7 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2015 Kazuya GODA <goda@openbsd.org> * @@ -119,7 +119,6 @@ etherip_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = etherip_ioctl; ifp->if_start = etherip_start; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); ifp->if_capabilities = IFCAP_VLAN_MTU; diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index afb8ff0ab06..c76254736c2 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.84 2016/01/14 09:20:31 mpi Exp $ */ +/* $OpenBSD: if_gif.c,v 1.85 2016/04/13 11:41:15 mpi Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -122,7 +122,6 @@ gif_clone_create(struct if_clone *ifc, int unit) sc->gif_if.if_rtrequest = p2p_rtrequest; sc->gif_if.if_type = IFT_GIF; IFQ_SET_MAXLEN(&sc->gif_if.if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&sc->gif_if.if_snd); sc->gif_if.if_softc = sc; if_attach(&sc->gif_if); if_alloc_sadl(&sc->gif_if); diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 7457b5b325b..7d03b3eab81 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_loop.c,v 1.75 2015/12/05 10:07:55 tedu Exp $ */ +/* $OpenBSD: if_loop.c,v 1.76 2016/04/13 11:41:15 mpi Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* @@ -179,7 +179,6 @@ loop_clone_create(struct if_clone *ifc, int unit) ifp->if_type = IFT_LOOP; ifp->if_hdrlen = sizeof(u_int32_t); ifp->if_addrlen = 0; - IFQ_SET_READY(&ifp->if_snd); if (unit == 0) { if_attachhead(ifp); if_addgroup(ifp, ifc->ifc_name); diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index 10cbe545f95..dc228ce7ddc 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.53 2016/01/14 09:20:31 mpi Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.54 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -97,7 +97,6 @@ mpe_clone_create(struct if_clone *ifc, int unit) ifp->if_type = IFT_MPLS; ifp->if_hdrlen = MPE_HDRLEN; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); if_alloc_sadl(ifp); #if NBPFILTER > 0 diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c index 8e8159f09e0..ae309f470ea 100644 --- a/sys/net/if_mpw.c +++ b/sys/net/if_mpw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpw.c,v 1.13 2016/03/09 04:19:43 dlg Exp $ */ +/* $OpenBSD: if_mpw.c,v 1.14 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena <rzalamena@openbsd.org> @@ -98,7 +98,6 @@ mpw_clone_create(struct if_clone *ifc, int unit) ifp->if_type = IFT_MPLSTUNNEL; ifp->if_hdrlen = ETHER_HDR_LEN; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); if_alloc_sadl(ifp); diff --git a/sys/net/if_pair.c b/sys/net/if_pair.c index abc337d3849..92241b6a0bb 100644 --- a/sys/net/if_pair.c +++ b/sys/net/if_pair.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pair.c,v 1.6 2015/12/05 10:07:55 tedu Exp $ */ +/* $OpenBSD: if_pair.c,v 1.7 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -121,7 +121,6 @@ pair_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = pairioctl; ifp->if_start = pairstart; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); ifp->if_hardmtu = 0xffff; ifp->if_capabilities = IFCAP_VLAN_MTU; diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 3a2ae1bf6fc..99ddaf972a9 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.97 2015/11/20 06:22:09 jsg Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.98 2016/04/13 11:41:15 mpi Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -226,7 +226,6 @@ ppp_clone_create(struct if_clone *ifc, int unit) IFQ_SET_MAXLEN(&sc->sc_if.if_snd, IFQ_MAXLEN); mq_init(&sc->sc_inq, IFQ_MAXLEN, IPL_NET); ppp_pkt_list_init(&sc->sc_rawq, IFQ_MAXLEN); - IFQ_SET_READY(&sc->sc_if.if_snd); if_attach(&sc->sc_if); if_alloc_sadl(&sc->sc_if); #if NBPFILTER > 0 diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index 0b3e4a27462..7e2bb27806b 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.53 2016/04/01 04:03:35 jsg Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.54 2016/04/13 11:41:15 mpi Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -218,7 +218,6 @@ pppoe_clone_create(struct if_clone *ifc, int unit) sc->sc_sppp.pp_tls = pppoe_tls; sc->sc_sppp.pp_tlf = pppoe_tlf; IFQ_SET_MAXLEN(&sc->sc_sppp.pp_if.if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&sc->sc_sppp.pp_if.if_snd); /* changed to real address later */ memcpy(&sc->sc_dest, etherbroadcastaddr, sizeof(sc->sc_dest)); diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c index 889eb025d9e..02c2fe001b8 100644 --- a/sys/net/if_pppx.c +++ b/sys/net/if_pppx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppx.c,v 1.50 2016/01/31 13:54:13 stefan Exp $ */ +/* $OpenBSD: if_pppx.c,v 1.51 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org> @@ -844,7 +844,6 @@ pppx_add_session(struct pppx_dev *pxd, struct pipex_session_req *req) ifp->if_rtrequest = p2p_rtrequest; ifp->if_type = IFT_PPP; IFQ_SET_MAXLEN(&ifp->if_snd, 1); - IFQ_SET_READY(&ifp->if_snd); ifp->if_softc = pxi; /* ifp->if_rdomain = req->pr_rdomain; */ diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 478571a4540..928a5f7c90c 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.126 2015/12/31 14:18:34 sthen Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.127 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -188,7 +188,6 @@ trunk_clone_create(struct if_clone *ifc, int unit) ifp->if_capabilities = trunk_capabilities(tr); IFQ_SET_MAXLEN(&ifp->if_snd, 1); - IFQ_SET_READY(&ifp->if_snd); snprintf(ifp->if_xname, sizeof(ifp->if_xname), "%s%d", ifc->ifc_name, unit); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index a99d28d6b85..833003ab06b 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.167 2016/03/01 21:47:52 stsp Exp $ */ +/* $OpenBSD: if_tun.c,v 1.168 2016/04/13 11:41:15 mpi Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -211,7 +211,6 @@ tun_create(struct if_clone *ifc, int unit, int flags) ifp->if_hardmtu = TUNMRU; ifp->if_link_state = LINK_STATE_DOWN; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); if ((flags & TUN_LAYER2) == 0) { tp->tun_flags &= ~TUN_LAYER2; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 08facc5afad..83952e3526a 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_var.h,v 1.69 2015/12/18 14:02:15 visa Exp $ */ +/* $OpenBSD: if_var.h,v 1.70 2016/04/13 11:41:15 mpi Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -257,7 +257,6 @@ do { \ #define IFQ_LEN(ifq) ifq_len(ifq) #define IFQ_IS_EMPTY(ifq) ifq_empty(ifq) #define IFQ_SET_MAXLEN(ifq, len) ifq_set_maxlen(ifq, len) -#define IFQ_SET_READY(ifq) do { } while (0) /* default interface priorities */ #define IF_WIRED_DEFAULT_PRIORITY 0 diff --git a/sys/net/if_vether.c b/sys/net/if_vether.c index 004b0abade0..dbc90a7cdc2 100644 --- a/sys/net/if_vether.c +++ b/sys/net/if_vether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vether.c,v 1.26 2015/12/05 10:07:55 tedu Exp $ */ +/* $OpenBSD: if_vether.c,v 1.27 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2009 Theo de Raadt @@ -88,7 +88,6 @@ vether_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = vetherioctl; ifp->if_start = vetherstart; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); ifp->if_capabilities = IFCAP_VLAN_MTU; diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 7f0e74c8add..1c89ed2a848 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.159 2016/04/04 01:55:44 dlg Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.160 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -162,7 +162,6 @@ vlan_clone_create(struct if_clone *ifc, int unit) ifp->if_start = vlan_start; ifp->if_ioctl = vlan_ioctl; IFQ_SET_MAXLEN(&ifp->if_snd, 1); - IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); ether_ifattach(ifp); ifp->if_hdrlen = EVL_ENCAPLEN; diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 748d494dcb9..7d7bb4aafe5 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.37 2016/01/22 11:56:14 goda Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.38 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -138,7 +138,6 @@ vxlan_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = vxlanioctl; ifp->if_start = vxlanstart; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - IFQ_SET_READY(&ifp->if_snd); ifp->if_hardmtu = 0xffff; ifp->if_capabilities = IFCAP_VLAN_MTU; diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 795189c71f1..0ab7d5714c2 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.287 2016/02/23 01:39:14 dlg Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.288 2016/04/13 11:41:15 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -796,7 +796,6 @@ carp_clone_create(struct if_clone *ifc, int unit) ifp->if_ioctl = carp_ioctl; ifp->if_start = carp_start; IFQ_SET_MAXLEN(&ifp->if_snd, 1); - IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); ether_ifattach(ifp); ifp->if_type = IFT_CARP; |