diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/arm/ether3.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/arm/ether3.c')
| -rw-r--r-- | drivers/net/arm/ether3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index 1f7a69c929a6..d9de9bce2395 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c | |||
| @@ -463,7 +463,7 @@ static void ether3_setmulticastlist(struct net_device *dev) | |||
| 463 | if (dev->flags & IFF_PROMISC) { | 463 | if (dev->flags & IFF_PROMISC) { |
| 464 | /* promiscuous mode */ | 464 | /* promiscuous mode */ |
| 465 | priv(dev)->regs.config1 |= CFG1_RECVPROMISC; | 465 | priv(dev)->regs.config1 |= CFG1_RECVPROMISC; |
| 466 | } else if (dev->flags & IFF_ALLMULTI || dev->mc_count) { | 466 | } else if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev)) { |
| 467 | priv(dev)->regs.config1 |= CFG1_RECVSPECBRMULTI; | 467 | priv(dev)->regs.config1 |= CFG1_RECVSPECBRMULTI; |
| 468 | } else | 468 | } else |
| 469 | priv(dev)->regs.config1 |= CFG1_RECVSPECBROAD; | 469 | priv(dev)->regs.config1 |= CFG1_RECVSPECBROAD; |