diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-11-18 02:10:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-11-18 02:10:00 +0000 |
| commit | 9ee962b67f88afc2f2c4dd0b94c62ffb2d7a5f32 (patch) | |
| tree | 08097a3b77bbe52ef7d302f77539c663f7f99515 /sys | |
| parent | 5cfc84e03fb8b67423babab08dbc786daa25358b (diff) | |
do not do setup that ether_ifattach() takes care of; ok jsg
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_trunk.c | 9 | ||||
| -rw-r--r-- | sys/net/if_vlan.c | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 00cb5ac477f..407a3c8f3ff 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.69 2009/09/17 13:13:56 claudio Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.70 2009/11/18 02:09:59 deraadt Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -187,13 +187,10 @@ trunk_clone_create(struct if_clone *ifc, int unit) ifmedia_set(&tr->tr_media, IFM_ETHER | IFM_AUTO); ifp = &tr->tr_ac.ac_if; - ifp->if_carp = NULL; - ifp->if_type = IFT_ETHER; ifp->if_softc = tr; ifp->if_start = trunk_start; ifp->if_watchdog = trunk_watchdog; ifp->if_ioctl = trunk_ioctl; - ifp->if_output = ether_output; ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; ifp->if_capabilities = trunk_capabilities(tr); @@ -921,9 +918,9 @@ trunk_start(struct ifnet *ifp) { struct trunk_softc *tr = (struct trunk_softc *)ifp->if_softc; struct mbuf *m; - int error = 0; + int error; - for (;; error = 0) { + for (;;) { IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index c9fd3ddd7b1..85a6435f24e 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.80 2009/07/16 22:58:45 thib Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.81 2009/11/18 02:09:59 deraadt Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -132,7 +132,6 @@ vlan_clone_create(struct if_clone *ifc, int unit) ifp->if_start = vlan_start; ifp->if_ioctl = vlan_ioctl; - ifp->if_output = ether_output; IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); |