Merge branch 'net-stmmac-Fix-multicast-filter-on-IPQ806x' (ae8bd302) · Commits · 戴 / test

Jonathan McDowell says: ==================== net: stmmac: Fix multicast filter on IPQ806x This pair of patches are the result of discovering a failure to correctly receive IPv6 multicast packets on such a device (in particular DHCPv6 requests and RA solicitations). Putting the device into promiscuous mode, or allmulti, both resulted in such packets correctly being received. Examination of the vendor driver (nss-gmac from the qsdk) shows that it does not enable the multicast filter and instead falls back to allmulti. Extend the base dwmac1000 driver to fall back when there's no suitable hardware filter, and update the ipq806x platform to request this. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
		plat_dat->has_gmac = true;
		plat_dat->bsp_priv = gmac;
		plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
		plat_dat->multicast_filter_bins = 0;

		err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
		if (err)

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,9 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
		value = GMAC_FRAME_FILTER_PR \| GMAC_FRAME_FILTER_PCF;
		} else if (dev->flags & IFF_ALLMULTI) {
		value = GMAC_FRAME_FILTER_PM; /* pass all multi */
		} else if (!netdev_mc_empty(dev) && (mcbitslog2 == 0)) {
		/* Fall back to all multicast if we've no filter */
		value = GMAC_FRAME_FILTER_PM;
		} else if (!netdev_mc_empty(dev)) {
		struct netdev_hw_addr *ha;

Admin message