Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9a4fd1 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by David S. Miller
Browse files

forcedeth: multicast fix 



This patch fixes the case where no multicast addresses are requested to
be added to the multicast filter. The multicast mask must be set to all
1's instead of all 0's.

Signed-off-by: default avatarAyaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32fa8b27

drivers/net/forcedeth.c

+9 −4
Original line number Diff line number Diff line
@@ -277,7 +277,9 @@ enum { 
#define NVREG_MCASTADDRA_FORCE	0x01

	NvRegMulticastAddrB = 0xB4,

	NvRegMulticastMaskA = 0xB8,

#define NVREG_MCASTMASKA_NONE		0xffffffff

	NvRegMulticastMaskB = 0xBC,

#define NVREG_MCASTMASKB_NONE		0xffff



	NvRegPhyInterface = 0xC0,

#define PHY_RGMII		0x10000000
@@ -2693,6 +2695,9 @@ static void nv_set_multicast(struct net_device *dev) 
			addr[1] = alwaysOn[1];

			mask[0] = alwaysOn[0] | alwaysOff[0];

			mask[1] = alwaysOn[1] | alwaysOff[1];

		} else {

			mask[0] = NVREG_MCASTMASKA_NONE;

			mask[1] = NVREG_MCASTMASKB_NONE;

		}

	}

	addr[0] |= NVREG_MCASTADDRA_FORCE;
@@ -4803,8 +4808,8 @@ static int nv_open(struct net_device *dev) 
		nv_mac_reset(dev);

	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);

	writel(0, base + NvRegMulticastAddrB);

	writel(0, base + NvRegMulticastMaskA);

	writel(0, base + NvRegMulticastMaskB);

	writel(NVREG_MCASTMASKA_NONE, base + NvRegMulticastMaskA);

	writel(NVREG_MCASTMASKB_NONE, base + NvRegMulticastMaskB);

	writel(0, base + NvRegPacketFilterFlags);



	writel(0, base + NvRegTransmitterControl);
@@ -4898,8 +4903,8 @@ static int nv_open(struct net_device *dev) 
	spin_lock_irq(&np->lock);

	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);

	writel(0, base + NvRegMulticastAddrB);

	writel(0, base + NvRegMulticastMaskA);

	writel(0, base + NvRegMulticastMaskB);

	writel(NVREG_MCASTMASKA_NONE, base + NvRegMulticastMaskA);

	writel(NVREG_MCASTMASKB_NONE, base + NvRegMulticastMaskB);

	writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);

	/* One manual link speed update: Interrupts are enabled, future link

	 * speed changes cause interrupts and are handled by nv_link_irq().