From e003b7d86f9a3943940a3524e771474f1ad1fd76 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:45:50 +0900 Subject: [PATCH] --- yaml --- r: 61511 b: refs/heads/master c: b947dd4b62a6adfd78292319a9d2e6396c1fb064 h: refs/heads/master i: 61509: 3d5f0fb546d980e071d69726b80c40e6cbd0f5b0 61507: a11ec099d55b9533bd4b393d3cbff53efae66fc4 61503: 46bc74b55a6e9132736d27e26689f17587237f21 v: v3 --- [refs] | 2 +- trunk/drivers/net/ni5010.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 03444449ee13..856dda38065e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78af36623b8eeead1c8590b43616eab159526fa +refs/heads/master: b947dd4b62a6adfd78292319a9d2e6396c1fb064 diff --git a/trunk/drivers/net/ni5010.c b/trunk/drivers/net/ni5010.c index 3d5b4232f65f..22a3b3dc7d89 100644 --- a/trunk/drivers/net/ni5010.c +++ b/trunk/drivers/net/ni5010.c @@ -670,14 +670,10 @@ static void ni5010_set_multicast_list(struct net_device *dev) PRINTK2((KERN_DEBUG "%s: entering set_multicast_list\n", dev->name)); - if (dev->flags&IFF_PROMISC || dev->flags&IFF_ALLMULTI) { + if (dev->flags&IFF_PROMISC || dev->flags&IFF_ALLMULTI || dev->mc_list) { dev->flags |= IFF_PROMISC; outb(RMD_PROMISC, EDLC_RMODE); /* Enable promiscuous mode */ PRINTK((KERN_DEBUG "%s: Entering promiscuous mode\n", dev->name)); - } else if (dev->mc_list) { - /* Sorry, multicast not supported */ - PRINTK((KERN_DEBUG "%s: No multicast, entering broadcast mode\n", dev->name)); - outb(RMD_BROADCAST, EDLC_RMODE); } else { PRINTK((KERN_DEBUG "%s: Entering broadcast mode\n", dev->name)); outb(RMD_BROADCAST, EDLC_RMODE); /* Disable promiscuous mode, use normal mode */