[PATCH] Fix IXP4xx Ethernet RX with both IFF_ALLMULTI and IFF_PROMISC.

[Krzysztof Halasa <khc@pm.waw.pl>]

This long standing bug caused IFF_PROMISC to be ignored when
IFF_ALLMULTI was requested.

Also, without any multicast address configured, the driver will use
device MAC address for the multicast filter, instead of accepting all
inbound traffic.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -933,40 +933,42 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
 static void eth_set_mcast_list(struct net_device *dev)
 {
 	struct port *port = netdev_priv(dev);
-	struct netdev_hw_addr *ha;
-	u8 diffs[ETH_ALEN], *addr;
 	int i;
 	static const u8 allmulti[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-	if (dev->flags & IFF_ALLMULTI) {
-		for (i = 0; i < ETH_ALEN; i++) {
-			__raw_writel(allmulti[i], &port->regs->mcast_addr[i]);
-			__raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
-		}
-		__raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,
-			&port->regs->rx_control[0]);
-		return;
-	}
-
-	if ((dev->flags & IFF_PROMISC) || netdev_mc_empty(dev)) {
+	if (dev->flags & IFF_PROMISC) {
 		__raw_writel(DEFAULT_RX_CNTRL0 & ~RX_CNTRL0_ADDR_FLTR_EN,
 			     &port->regs->rx_control[0]);
 		return;
 	}
 
-	memset(diffs, 0, ETH_ALEN);
+	if (dev->flags & IFF_ALLMULTI) {
+		for (i = 0; i < ETH_ALEN; i++) {
+			__raw_writel(allmulti[i], &port->regs->mcast_addr[i]);
+			__raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
+		}
+	} else {
+		struct netdev_hw_addr *ha;
+		u8 diffs[ETH_ALEN], *addr = NULL;
+
+		memset(diffs, 0, ETH_ALEN);
+
+		/* calculate bits which differ between multicast addresses */
+		netdev_for_each_mc_addr(ha, dev) {
+			if (!addr)
+				addr = ha->addr; /* first multicast address */
+			else
+				for (i = 0; i < ETH_ALEN; i++)
+					diffs[i] |= addr[i] ^ ha->addr[i];
+		}
 
-	addr = NULL;
-	netdev_for_each_mc_addr(ha, dev) {
-		if (!addr)
-			addr = ha->addr; /* first MAC address */
-		for (i = 0; i < ETH_ALEN; i++)
-			diffs[i] |= addr[i] ^ ha->addr[i];
-	}
+		if (!addr) /* use device MAC address instead */
+			addr = dev->dev_addr;
 
-	for (i = 0; i < ETH_ALEN; i++) {
-		__raw_writel(addr[i], &port->regs->mcast_addr[i]);
-		__raw_writel(~diffs[i], &port->regs->mcast_mask[i]);
+		for (i = 0; i < ETH_ALEN; i++) {
+			__raw_writel(addr[i], &port->regs->mcast_addr[i]);
+			__raw_writel(~diffs[i], &port->regs->mcast_mask[i]);
+		}
 	}
 
 	__raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,

-- 
Krzysztof Halasa