MULTICAST is standard now

This commit is contained in:
deraadt 1994-04-08 01:14:24 +00:00
parent 4fffd61a7f
commit 887f77edc0
2 changed files with 4 additions and 26 deletions

View File

@ -33,7 +33,7 @@
* @(#)if_le.c 8.1 (Berkeley) 6/11/93
*
* from: Header: if_le.c,v 1.23 93/04/21 02:39:38 torek Exp
* $Id: if_le.c,v 1.4 1994/01/24 00:30:29 deraadt Exp $
* $Id: if_le.c,v 1.5 1994/04/08 01:14:24 deraadt Exp $
*/
#include "bpfilter.h"
@ -154,9 +154,7 @@ struct cfdriver lecd =
/* Forwards */
void leattach(struct device *, struct device *, void *);
#ifdef MULTICAST
void lesetladrf(struct le_softc *);
#endif
void lereset(struct device *);
int leinit(int);
int lestart(struct ifnet *);
@ -256,10 +254,7 @@ if (!ISQUADALIGN(a))
ifp->if_ioctl = leioctl;
ifp->if_output = ether_output;
ifp->if_start = lestart;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
#ifdef MULTICAST
ifp->if_flags |= IFF_MULTICAST;
#endif
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
#ifdef IFF_NOTRAILERS
/* XXX still compile when the blasted things are gone... */
ifp->if_flags |= IFF_NOTRAILERS;
@ -278,7 +273,6 @@ if (!ISQUADALIGN(a))
bootdv = &sc->sc_dev;
}
#ifdef MULTICAST
/*
* Setup the logical address filter
*/
@ -353,7 +347,6 @@ lesetladrf(sc)
ETHER_NEXT_MULTI(step, enm);
}
}
#endif /* MULTICAST */
void
lereset(dev)
@ -373,10 +366,8 @@ lereset(dev)
ler1->ler1_rap = LE_CSR0;
ler1->ler1_rdp = LE_C0_STOP;
#ifdef MULTICAST
/* Setup the logical address filter */
lesetladrf(sc);
#endif
/* init receive and transmit rings */
a = LANCE_ADDR(&ler2->ler2_rbuf[0][0]);
@ -967,7 +958,6 @@ leioctl(ifp, cmd, data)
}
break;
#ifdef MULTICAST
case SIOCADDMULTI:
error = ether_addmulti((struct ifreq *)data, &sc->sc_ac);
goto update_multicast;
@ -984,7 +974,6 @@ leioctl(ifp, cmd, data)
error = 0;
}
break;
#endif
default:
error = EINVAL;
}

View File

@ -33,7 +33,7 @@
* @(#)if_le.c 8.1 (Berkeley) 6/11/93
*
* from: Header: if_le.c,v 1.23 93/04/21 02:39:38 torek Exp
* $Id: if_le.c,v 1.4 1994/01/24 00:30:29 deraadt Exp $
* $Id: if_le.c,v 1.5 1994/04/08 01:14:24 deraadt Exp $
*/
#include "bpfilter.h"
@ -154,9 +154,7 @@ struct cfdriver lecd =
/* Forwards */
void leattach(struct device *, struct device *, void *);
#ifdef MULTICAST
void lesetladrf(struct le_softc *);
#endif
void lereset(struct device *);
int leinit(int);
int lestart(struct ifnet *);
@ -256,10 +254,7 @@ if (!ISQUADALIGN(a))
ifp->if_ioctl = leioctl;
ifp->if_output = ether_output;
ifp->if_start = lestart;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
#ifdef MULTICAST
ifp->if_flags |= IFF_MULTICAST;
#endif
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
#ifdef IFF_NOTRAILERS
/* XXX still compile when the blasted things are gone... */
ifp->if_flags |= IFF_NOTRAILERS;
@ -278,7 +273,6 @@ if (!ISQUADALIGN(a))
bootdv = &sc->sc_dev;
}
#ifdef MULTICAST
/*
* Setup the logical address filter
*/
@ -353,7 +347,6 @@ lesetladrf(sc)
ETHER_NEXT_MULTI(step, enm);
}
}
#endif /* MULTICAST */
void
lereset(dev)
@ -373,10 +366,8 @@ lereset(dev)
ler1->ler1_rap = LE_CSR0;
ler1->ler1_rdp = LE_C0_STOP;
#ifdef MULTICAST
/* Setup the logical address filter */
lesetladrf(sc);
#endif
/* init receive and transmit rings */
a = LANCE_ADDR(&ler2->ler2_rbuf[0][0]);
@ -967,7 +958,6 @@ leioctl(ifp, cmd, data)
}
break;
#ifdef MULTICAST
case SIOCADDMULTI:
error = ether_addmulti((struct ifreq *)data, &sc->sc_ac);
goto update_multicast;
@ -984,7 +974,6 @@ leioctl(ifp, cmd, data)
error = 0;
}
break;
#endif
default:
error = EINVAL;
}