From e6d1162aad91ab78d599071ab1a0b1b1cf7ee082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Tue, 17 Jul 2007 13:46:00 +0900 Subject: [PATCH] --- yaml --- r: 61512 b: refs/heads/master c: 82a0244df8165b0345cde5258afe176c12dd1e99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/saa9730.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 856dda38065e..97a09db57fe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b947dd4b62a6adfd78292319a9d2e6396c1fb064 +refs/heads/master: 82a0244df8165b0345cde5258afe176c12dd1e99 diff --git a/trunk/drivers/net/saa9730.c b/trunk/drivers/net/saa9730.c index 451486b32f23..7dae4d404978 100644 --- a/trunk/drivers/net/saa9730.c +++ b/trunk/drivers/net/saa9730.c @@ -940,15 +940,14 @@ static void lan_saa9730_set_multicast(struct net_device *dev) CAM_CONTROL_GROUP_ACC | CAM_CONTROL_BROAD_ACC, &lp->lan_saa9730_regs->CamCtl); } else { - if (dev->flags & IFF_ALLMULTI) { + if (dev->flags & IFF_ALLMULTI || dev->mc_count) { /* accept all multicast packets */ - writel(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC | - CAM_CONTROL_BROAD_ACC, - &lp->lan_saa9730_regs->CamCtl); - } else { /* * Will handle the multicast stuff later. -carstenl */ + writel(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC | + CAM_CONTROL_BROAD_ACC, + &lp->lan_saa9730_regs->CamCtl); } }