Say goodbye to IFF_NOTRAILERS. Support for trailers was officially

dropped for 4.4, but for some reason this flag lived on.  (Until
today, that is.)
This commit is contained in:
Garrett Wollman 1995-10-13 19:48:06 +00:00
parent ed07cc7f09
commit 233b60cec4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=11460
20 changed files with 45 additions and 82 deletions

View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_de.c,v 1.32 1995/10/02 14:04:33 davidg Exp $
* $Id: if_de.c,v 1.33 1995/10/07 20:34:30 davidg Exp $
*
*/
@ -1987,7 +1987,7 @@ tulip_attach(
{
struct ifnet * const ifp = &sc->tulip_if;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST;
ifp->if_ioctl = tulip_ioctl;
ifp->if_output = ether_output;
ifp->if_start = tulip_start;

View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.76 1995/08/25 19:50:15 bde Exp $
* $Id: if_ed.c,v 1.77 1995/10/10 09:52:30 phk Exp $
*/
#include "ed.h"
@ -1412,10 +1412,10 @@ ed_attach(isa_dev)
*/
if (isa_dev->id_flags & ED_FLAGS_DISABLE_TRANCEIVER)
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX |
IFF_NOTRAILERS | IFF_MULTICAST | IFF_ALTPHYS);
IFF_MULTICAST | IFF_ALTPHYS);
else
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX |
IFF_NOTRAILERS | IFF_MULTICAST);
IFF_MULTICAST);
/*
* Attach the interface

View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.29 1995/07/05 07:21:34 davidg Exp $
* $Id: if_ep.c,v 1.30 1995/08/28 12:01:17 guido Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -423,7 +423,7 @@ epattach(is)
ifp->if_unit = is->id_unit;
ifp->if_name = "ep";
ifp->if_mtu = ETHERMTU;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
ifp->if_init = epinit;
ifp->if_output = ether_output;
ifp->if_start = epstart;

View File

@ -1070,7 +1070,7 @@ fe_attach ( struct isa_device *isa_dev )
/*
* Set default interface flags.
*/
sc->sc_if.if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_MULTICAST;
sc->sc_if.if_flags = IFF_BROADCAST | IFF_MULTICAST;
/*
* Set maximum size of output queue, if it has not been set.

View File

@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.25 1995/08/16 16:12:32 bde Exp $
* $Id: if_ie.c,v 1.26 1995/09/19 18:55:09 bde Exp $
*/
/*
@ -576,9 +576,7 @@ ieattach(dvp)
ie_softc[unit].hard_vers + 1,
ether_sprintf(ie->arpcom.ac_enaddr));
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags |= IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_init = ieinit;
ifp->if_output = ether_output;
ifp->if_start = iestart;

View File

@ -1083,7 +1083,7 @@ lnc_attach(struct isa_device * isa_dev)
sc->arpcom.ac_if.if_name = lncdriver.name;
sc->arpcom.ac_if.if_unit = isa_dev->id_unit;
sc->arpcom.ac_if.if_mtu = ETHERMTU;
sc->arpcom.ac_if.if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX;
sc->arpcom.ac_if.if_flags = IFF_BROADCAST | IFF_SIMPLEX;
sc->arpcom.ac_if.if_timer = 0;
sc->arpcom.ac_if.if_init = lnc_init;
sc->arpcom.ac_if.if_output = ether_output;
@ -1131,7 +1131,7 @@ lnc_init(int unit)
s = splimp();
lnc_stop(unit);
sc->arpcom.ac_if.if_flags |= IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX;
sc->arpcom.ac_if.if_flags |= IFF_BROADCAST | IFF_SIMPLEX; /* XXX??? */
/*
* This sets up the memory area for the controller. Memory is set up for

View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.76 1995/08/25 19:50:15 bde Exp $
* $Id: if_ed.c,v 1.77 1995/10/10 09:52:30 phk Exp $
*/
#include "ed.h"
@ -1412,10 +1412,10 @@ ed_attach(isa_dev)
*/
if (isa_dev->id_flags & ED_FLAGS_DISABLE_TRANCEIVER)
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX |
IFF_NOTRAILERS | IFF_MULTICAST | IFF_ALTPHYS);
IFF_MULTICAST | IFF_ALTPHYS);
else
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX |
IFF_NOTRAILERS | IFF_MULTICAST);
IFF_MULTICAST);
/*
* Attach the interface

View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_eg.c,v 1.3 1995/04/12 20:47:47 wollman Exp $
* $Id: if_eg.c,v 1.4 1995/05/30 08:02:02 rgrimes Exp $
*/
/* To do:
@ -419,7 +419,7 @@ egattach (struct isa_device *id)
ifp->if_start = egstart;
ifp->if_ioctl = egioctl;
ifp->if_reset = egreset;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
/* Now we can attach the interface. */
if_attach(ifp);

View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.13.2.1 1995/06/09 18:12:09 davidg Exp $
* $Id: if_el.c,v 1.14 1995/06/11 19:31:25 rgrimes Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -212,7 +212,7 @@ int el_attach(struct isa_device *idev)
ifp->if_ioctl = el_ioctl;
ifp->if_reset = el_reset;
ifp->if_watchdog = el_watchdog;
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS);
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX);
/* Now we can attach the interface */
dprintf(("Attaching interface...\n"));

View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.29 1995/07/05 07:21:34 davidg Exp $
* $Id: if_ep.c,v 1.30 1995/08/28 12:01:17 guido Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -423,7 +423,7 @@ epattach(is)
ifp->if_unit = is->id_unit;
ifp->if_name = "ep";
ifp->if_mtu = ETHERMTU;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
ifp->if_init = epinit;
ifp->if_output = ether_output;
ifp->if_start = epstart;

View File

@ -1070,7 +1070,7 @@ fe_attach ( struct isa_device *isa_dev )
/*
* Set default interface flags.
*/
sc->sc_if.if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_MULTICAST;
sc->sc_if.if_flags = IFF_BROADCAST | IFF_MULTICAST;
/*
* Set maximum size of output queue, if it has not been set.

View File

@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.25 1995/08/16 16:12:32 bde Exp $
* $Id: if_ie.c,v 1.26 1995/09/19 18:55:09 bde Exp $
*/
/*
@ -576,9 +576,7 @@ ieattach(dvp)
ie_softc[unit].hard_vers + 1,
ether_sprintf(ie->arpcom.ac_enaddr));
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags |= IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_init = ieinit;
ifp->if_output = ether_output;
ifp->if_start = iestart;

View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ix.c,v 1.8 1995/09/19 18:55:11 bde Exp $
* $Id: if_ix.c,v 1.9 1995/10/05 03:01:13 davidg Exp $
*/
#include "ix.h"
@ -577,24 +577,17 @@ ixattach(struct isa_device *dvp) {
* the = 0;'s
* Infact we should bzero this just to make sure
* that something does not get missed.
* Further note by GW:
* Actually, it's a complete waste of time to zero any of
* this stuff because the C language guarantees that it's
* already zeroed. If this code is changed to do dynamic
* allocation, this will have to get revisited.
*/
bzero(ifp, sizeof(ifp));
ifp->if_name = ixdriver.name;
ifp->if_unit = unit;
ifp->if_mtu = ETHERMTU;
ifp->if_flags = IFF_NOTRAILERS | IFF_BROADCAST;
/*
* This is commented out to save memory and cpu time
* ifp->if_timer = 0;
* ifp->if_metric = 0;
* ifp->if_addrlist = 0;
* ifp->if_snd.ifq_head = 0;
* ifp->if_snd.ifq_tail = 0;
* ifp->if_snd.ifq_len = 0;
* ifp->if_snd.ifq_maxlen = 0;
* ifp->if_snd.ifq_drops = 0;
* end of commented out block
*/
ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST;
ifp->if_init = ixinit;
ifp->if_output = ether_output;
ifp->if_start = ixstart;
@ -602,34 +595,9 @@ ixattach(struct isa_device *dvp) {
ifp->if_ioctl = ixioctl;
ifp->if_reset = ixreset;
ifp->if_watchdog = ixwatchdog;
/*
* This is commented out to save memory and cpu time
* ifp->if_ipackets = 0;
* ifp->if_ierrors = 0;
* ifp->if_opackets = 0;
* ifp->if_oerrors = 0;
* ifp->if_collisions = 0;
* ifp->if_next = 0;
* end of commented out block
*/
ifp->if_type = IFT_ETHER;
ifp->if_addrlen = ETHER_ADDRESS_LENGTH;
ifp->if_hdrlen = ETHER_HEADER_LENGTH;
/*
* This is commented out to save memory and cpu time
* ifp->if_index = 0;
* ifp->if_lastchange.tv_sec = 0;
* ifp->if_lastchange.tv_usec = 0;
* ifp->if_ibytes = 0;
* ifp->if_obytes = 0;
* ifp->if_imcasts = 0;
* ifp->if_omcasts = 0;
* ifp->if_iqdrops = 0;
* ifp->if_noproto = 0;
* ifp->if_baudrate = 0;
* ifp->if_pcount = 0;
* end of commented out block
*/
#ifdef IXCOUNTERS
/*
* ZZZ more counters added, but bzero gets them

View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.18 1995/07/29 13:00:17 paul Exp $
* $Id: if_le.c,v 1.19 1995/09/19 18:55:12 bde Exp $
*/
/*
@ -393,8 +393,7 @@ le_attach(
sc->le_prodname,
ether_sprintf(sc->le_ac.ac_enaddr));
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags |= IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_output = ether_output;
ifp->if_ioctl = le_ioctl;
ifp->if_type = IFT_ETHER;

View File

@ -1083,7 +1083,7 @@ lnc_attach(struct isa_device * isa_dev)
sc->arpcom.ac_if.if_name = lncdriver.name;
sc->arpcom.ac_if.if_unit = isa_dev->id_unit;
sc->arpcom.ac_if.if_mtu = ETHERMTU;
sc->arpcom.ac_if.if_flags = IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX;
sc->arpcom.ac_if.if_flags = IFF_BROADCAST | IFF_SIMPLEX;
sc->arpcom.ac_if.if_timer = 0;
sc->arpcom.ac_if.if_init = lnc_init;
sc->arpcom.ac_if.if_output = ether_output;
@ -1131,7 +1131,7 @@ lnc_init(int unit)
s = splimp();
lnc_stop(unit);
sc->arpcom.ac_if.if_flags |= IFF_BROADCAST | IFF_NOTRAILERS | IFF_SIMPLEX;
sc->arpcom.ac_if.if_flags |= IFF_BROADCAST | IFF_SIMPLEX; /* XXX??? */
/*
* This sets up the memory area for the controller. Memory is set up for

View File

@ -47,7 +47,7 @@
*/
/*
* $Id: if_ze.c,v 1.19 1995/08/16 16:12:35 bde Exp $
* $Id: if_ze.c,v 1.20 1995/09/26 08:57:47 phk Exp $
*/
#include "ze.h"
@ -612,7 +612,7 @@ ze_attach(isa_dev)
ifp->if_reset = ze_reset;
ifp->if_watchdog = ze_watchdog;
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS);
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX);
/*
* Attach the interface

View File

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_zp.c,v 1.7 1995/07/25 22:18:56 bde Exp $
* $Id: if_zp.c,v 1.8 1995/08/16 23:34:28 nate Exp $
*/
/*-
* TODO:
@ -912,7 +912,7 @@ zpattach(isa_dev)
sc->attached = 1;
#else /* MACH_KERNEL */
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
ifp->if_unit = isa_dev->id_unit;
ifp->if_name = "zp";
ifp->if_init = zpinit;

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if.h 8.1 (Berkeley) 6/10/93
* $Id: if.h,v 1.21 1995/08/30 00:33:17 bde Exp $
* $Id: if.h,v 1.22 1995/08/31 15:21:31 wollman Exp $
*/
#ifndef _NET_IF_H_
@ -179,7 +179,7 @@ struct ifnet {
#define IFF_DEBUG 0x4 /* turn on debugging */
#define IFF_LOOPBACK 0x8 /* is a loopback net */
#define IFF_POINTOPOINT 0x10 /* interface is point-to-point link */
#define IFF_NOTRAILERS 0x20 /* avoid use of trailers */
/*#define IFF_NOTRAILERS 0x20 * obsolete: avoid use of trailers */
#define IFF_RUNNING 0x40 /* resources allocated */
#define IFF_NOARP 0x80 /* no address resolution protocol */
#define IFF_PROMISC 0x100 /* receive all packets */

View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_de.c,v 1.32 1995/10/02 14:04:33 davidg Exp $
* $Id: if_de.c,v 1.33 1995/10/07 20:34:30 davidg Exp $
*
*/
@ -1987,7 +1987,7 @@ tulip_attach(
{
struct ifnet * const ifp = &sc->tulip_if;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST;
ifp->if_ioctl = tulip_ioctl;
ifp->if_output = ether_output;
ifp->if_start = tulip_start;

View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_pdq.c,v 1.5 1995/04/05 08:19:23 davidg Exp $
* $Id: if_pdq.c,v 1.6 1995/05/30 08:13:04 rgrimes Exp $
*
*/
@ -406,7 +406,7 @@ pdq_ifattach(
{
struct ifnet *ifp = &sc->sc_if;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST;
ifp->if_init = ifinit;
#ifndef __bsdi__