From 16b49b3e73a2e120dfae35d81b75a41d3c240bad Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Fri, 23 Sep 1994 06:22:58 +0000
Subject: [PATCH] Removed last vestige of MULTICAST option.

---
 sys/conf/NOTES       |  3 +--
 sys/i386/conf/LINT   |  3 +--
 sys/i386/conf/NOTES  |  3 +--
 sys/i386/isa/if_le.c | 14 ++------------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4c0fdec5e769..4d9fba905195 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
+#	$Id: LINT,v 1.82 1994/09/22 19:37:30 wollman Exp $
 #
 
 machine		"i386"
@@ -62,7 +62,6 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 #  the sound drivers.
 
 # Multicast support.
-options		MULTICAST		# Multicast code
 options		MROUTING		# Multicast routing
 
 #
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 4c0fdec5e769..4d9fba905195 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
+#	$Id: LINT,v 1.82 1994/09/22 19:37:30 wollman Exp $
 #
 
 machine		"i386"
@@ -62,7 +62,6 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 #  the sound drivers.
 
 # Multicast support.
-options		MULTICAST		# Multicast code
 options		MROUTING		# Multicast routing
 
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4c0fdec5e769..4d9fba905195 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
+#	$Id: LINT,v 1.82 1994/09/22 19:37:30 wollman Exp $
 #
 
 machine		"i386"
@@ -62,7 +62,6 @@ options		DSI_SOFT_MODEM		#code for DSI Softmodems
 #  the sound drivers.
 
 # Multicast support.
-options		MULTICAST		# Multicast code
 options		MROUTING		# Multicast routing
 
 #
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index bf5fa4c3de1a..b653474565a4 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -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.3 1994/08/20 03:48:39 davidg Exp $
+ * $Id: if_le.c,v 1.4 1994/08/23 07:52:17 paul Exp $
  *
  */
 
@@ -360,10 +360,7 @@ le_attach(
 	   sc->le_prodname,
 	   ether_sprintf(sc->le_ac.ac_enaddr));
 
-    ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
-#ifdef MULTICAST
-    ifp->if_flags  |= IFF_MULTICAST;
-#endif /* MULTICAST */
+    ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
 
     ifp->if_output = ether_output;
     ifp->if_ioctl = le_ioctl;
@@ -577,7 +574,6 @@ le_ioctl(
 	    break;
 	}
 
-#ifdef MULTICAST
 	case SIOCADDMULTI:
 	case SIOCDELMULTI: {
 	    /*
@@ -596,8 +592,6 @@ le_ioctl(
 	    break;
 	}
 
-#endif /* MULTICAST */
-
 	default: {
 	    error = EINVAL;
 	}
@@ -673,10 +667,8 @@ static void
 le_multi_filter(
     le_softc_t *sc)
 {
-#ifdef MULTICAST
     struct ether_multistep step;
     struct ether_multi *enm;
-#endif
 #ifdef ISO
     extern char all_es_snpa[];
 #endif
@@ -696,7 +688,6 @@ le_multi_filter(
     le_multi_op(sc, all_es_snpa, TRUE);
 #endif
 
-#ifdef MULTICAST
     ETHER_FIRST_MULTI(step, &sc->le_ac, enm);
     if (enm != NULL)
 	sc->le_flags |= IFF_MULTICAST;
@@ -710,7 +701,6 @@ le_multi_filter(
 	sc->le_flags &= ~LE_BRDCSTONLY;
     }
     sc->le_flags &= ~IFF_ALLMULTI;
-#endif
 }
 
 static void