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/de620.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 45794f6cb0f6..a0a6830b5e6d 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
| @@ -464,7 +464,7 @@ static int de620_close(struct net_device *dev) | |||
| 464 | 464 | ||
| 465 | static void de620_set_multicast_list(struct net_device *dev) | 465 | static void de620_set_multicast_list(struct net_device *dev) |
| 466 | { | 466 | { |
| 467 | if (dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC)) | 467 | if (!netdev_mc_empty(dev) || dev->flags&(IFF_ALLMULTI|IFF_PROMISC)) |
| 468 | { /* Enable promiscuous mode */ | 468 | { /* Enable promiscuous mode */ |
| 469 | de620_set_register(dev, W_TCR, (TCR_DEF & ~RXPBM) | RXALL); | 469 | de620_set_register(dev, W_TCR, (TCR_DEF & ~RXPBM) | RXALL); |
| 470 | } | 470 | } |