Message ID | 1382377504-24688-1-git-send-email-mceier+kernel@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Monday 21 October 2013 11:15 PM, Mariusz Ceier wrote: > When IFF_ALLMULTI flag is set on interface and IFF_PROMISC isn't, > emac_dev_mcast_set should only enable RX of multicasts and reset > MACHASH registers. > > It does this, but afterwards it either sets up multicast MACs > filtering or disables RX of multicasts and resets MACHASH registers > again, rendering IFF_ALLMULTI flag useless. > > This patch fixes emac_dev_mcast_set, so that multicast MACs filtering and > disabling of RX of multicasts are skipped when IFF_ALLMULTI flag is set. > > Tested with kernel 2.6.37. > > Signed-off-by: Mariusz Ceier <mceier+kernel@gmail.com> > --- Can you add [PATCH v2] in your subject in future so that it will be easier to the maintainer to pick the latest version of the patch. Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Regards Mugunthan V N -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Yes of course ;) This was my first patch for the kernel. I will remember about v2 tag next time. Thanks, Mariusz Ceier On 21 October 2013 19:50, Mugunthan V N <mugunthanvnm@ti.com> wrote: > On Monday 21 October 2013 11:15 PM, Mariusz Ceier wrote: >> When IFF_ALLMULTI flag is set on interface and IFF_PROMISC isn't, >> emac_dev_mcast_set should only enable RX of multicasts and reset >> MACHASH registers. >> >> It does this, but afterwards it either sets up multicast MACs >> filtering or disables RX of multicasts and resets MACHASH registers >> again, rendering IFF_ALLMULTI flag useless. >> >> This patch fixes emac_dev_mcast_set, so that multicast MACs filtering and >> disabling of RX of multicasts are skipped when IFF_ALLMULTI flag is set. >> >> Tested with kernel 2.6.37. >> >> Signed-off-by: Mariusz Ceier <mceier+kernel@gmail.com> >> --- > Can you add [PATCH v2] in your subject in future so that it will be > easier to the maintainer to pick the latest version of the patch. > > Acked-by: Mugunthan V N <mugunthanvnm@ti.com> > > Regards > Mugunthan V N -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Mariusz Ceier <mceier+kernel@gmail.com> Date: Mon, 21 Oct 2013 19:45:04 +0200 > When IFF_ALLMULTI flag is set on interface and IFF_PROMISC isn't, > emac_dev_mcast_set should only enable RX of multicasts and reset > MACHASH registers. > > It does this, but afterwards it either sets up multicast MACs > filtering or disables RX of multicasts and resets MACHASH registers > again, rendering IFF_ALLMULTI flag useless. > > This patch fixes emac_dev_mcast_set, so that multicast MACs filtering and > disabling of RX of multicasts are skipped when IFF_ALLMULTI flag is set. > > Tested with kernel 2.6.37. > > Signed-off-by: Mariusz Ceier <mceier+kernel@gmail.com> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Mariusz, On Mon, Oct 21, 2013 at 11:15 PM, Mariusz Ceier <mceier+kernel@gmail.com> wrote: > When IFF_ALLMULTI flag is set on interface and IFF_PROMISC isn't, > emac_dev_mcast_set should only enable RX of multicasts and reset > MACHASH registers. > > It does this, but afterwards it either sets up multicast MACs > filtering or disables RX of multicasts and resets MACHASH registers > again, rendering IFF_ALLMULTI flag useless. > > This patch fixes emac_dev_mcast_set, so that multicast MACs filtering and > disabling of RX of multicasts are skipped when IFF_ALLMULTI flag is set. > > Tested with kernel 2.6.37. > It would have been better if you would have tested this on the latest kernel. Anyway David has pulled this patch in his tree. Regards, --Prabhakar Lad -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 67df09e..6a32ef9 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -876,8 +876,7 @@ static void emac_dev_mcast_set(struct net_device *ndev) netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) { mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); - } - if (!netdev_mc_empty(ndev)) { + } else if (!netdev_mc_empty(ndev)) { struct netdev_hw_addr *ha; mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST);
When IFF_ALLMULTI flag is set on interface and IFF_PROMISC isn't, emac_dev_mcast_set should only enable RX of multicasts and reset MACHASH registers. It does this, but afterwards it either sets up multicast MACs filtering or disables RX of multicasts and resets MACHASH registers again, rendering IFF_ALLMULTI flag useless. This patch fixes emac_dev_mcast_set, so that multicast MACs filtering and disabling of RX of multicasts are skipped when IFF_ALLMULTI flag is set. Tested with kernel 2.6.37. Signed-off-by: Mariusz Ceier <mceier+kernel@gmail.com> --- drivers/net/ethernet/ti/davinci_emac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)