diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/net/lib82596.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/lib82596.c')
| -rw-r--r-- | drivers/net/lib82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index ce5d6e909218..c27f4291b350 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
| @@ -1343,7 +1343,7 @@ static void set_multicast_list(struct net_device *dev) | |||
| 1343 | DEB(DEB_MULTI, | 1343 | DEB(DEB_MULTI, |
| 1344 | printk(KERN_DEBUG | 1344 | printk(KERN_DEBUG |
| 1345 | "%s: set multicast list, %d entries, promisc %s, allmulti %s\n", | 1345 | "%s: set multicast list, %d entries, promisc %s, allmulti %s\n", |
| 1346 | dev->name, dev->mc_count, | 1346 | dev->name, netdev_mc_count(dev), |
| 1347 | dev->flags & IFF_PROMISC ? "ON" : "OFF", | 1347 | dev->flags & IFF_PROMISC ? "ON" : "OFF", |
| 1348 | dev->flags & IFF_ALLMULTI ? "ON" : "OFF")); | 1348 | dev->flags & IFF_ALLMULTI ? "ON" : "OFF")); |
| 1349 | 1349 | ||