patch-1.3.46 linux/drivers/net/tulip.c

• Lines: 23
• Date: Thu Nov 30 11:15:53 1995
• Orig file: v1.3.45/linux/drivers/net/tulip.c
• Orig date: Mon Nov 27 12:48:30 1995

diff -u --recursive --new-file v1.3.45/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -684,7 +684,7 @@
 		/* Log any net taps. */
 		printk("%s: Promiscuous mode enabled.\n", dev->name);
 	}
-	else if (dev->mc_count > 15 || (dev->mc_flags&IFF_ALLMULTI)) 
+	else if (dev->mc_count > 15 || (dev->flags&IFF_ALLMULTI)) 
 	{
 		/* Too many to filter perfectly -- accept all multicasts. */
 		outl(csr6 | 0x0080, ioaddr + CSR6);
@@ -727,11 +727,12 @@
 set_mac_address(struct device *dev, void *addr)
 {
 	int i;
+	struct sockaddr *sa=(struct sockaddr *)addr;
 	if (dev->start)
 		return -EBUSY;
 	printk("%s: Setting MAC address to ", dev->name);
 	for (i = 0; i < 6; i++)
-		printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
+		printk(" %2.2x", dev->dev_addr[i] = sa->sa_data[i]);
 	printk(".\n");
 	return 0;
 }