patch-1.3.44 linux/drivers/net/wavelan.c

Next file: linux/drivers/net/znet.c
Previous file: linux/drivers/net/tulip.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.43/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -80,7 +80,7 @@
 static void		wavelan_interrupt(int, struct pt_regs *);
 static int		wavelan_close(device *);
 static en_stats		*wavelan_get_stats(device *);
-static void		wavelan_set_multicast_list(device *, int, void *);
+static void		wavelan_set_multicast_list(device *);
 static int		wavelan_get_info(char*, char**, off_t, int, int);
 
 /*
@@ -1051,6 +1051,8 @@
 	 */
 	ether_setup(dev);
 
+	dev->flags &= ~IFF_MULTICAST;		/* Not yet supported */
+	
 	dev->mtu = WAVELAN_MTU;
 
 	if (wavelan_debug > 0)
@@ -2015,19 +2017,18 @@
 
 static
 void
-wavelan_set_multicast_list(device *dev, int num_addrs, void *addrs)
+wavelan_set_multicast_list(device *dev)
 {
 	net_local	*lp;
 	unsigned long	x;
 
 	if (wavelan_debug > 0)
-		printk("%s: ->wavelan_set_multicast_list(dev=0x%x, num_addrs=%d, addrs=0x%x)\n", dev->name, (unsigned int)dev, num_addrs, (unsigned int)addrs);
+		printk("%s: ->wavelan_set_multicast_list(dev=0x%x)", dev->name, dev);
 
 	lp = (net_local *)dev->priv;
 
-	switch (num_addrs)
+	if(dev->flags&IFF_PROMISC)
 	{
-	case -1:
 		/*
 		 * Promiscuous mode: receive all packets.
 		 */
@@ -2035,9 +2036,16 @@
 		x = wavelan_splhi();
 		(void)wavelan_hardware_reset(dev);
 		wavelan_splx(x);
-		break;
-
-	case 0:
+	}
+#if MULTICAST_IS_ADDED	
+	else if((dev->flags&IFF_ALLMULTI)||dev->mc_list)
+	{
+			
+	
+	}
+#endif	
+	else	
+	{
 		/*
 		 * Normal mode: disable promiscuous mode,
 		 * clear multicast list.
@@ -2046,14 +2054,6 @@
 		x = wavelan_splhi();
 		(void)wavelan_hardware_reset(dev);
 		wavelan_splx(x);
-		break;
-
-	default:
-		/*
-		 * Multicast mode: receive normal and
-		 * multicast packets and do best-effort filtering.
-		 */
-		break;
 	}
 
 	if (wavelan_debug > 0)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this