git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libertas: fix 8686 firmware loading regression
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ns83820.c
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index
1f6327d
..
8dd509c
100644
(file)
--- a/
drivers/net/ns83820.c
+++ b/
drivers/net/ns83820.c
@@
-1719,7
+1719,7
@@
static void ns83820_set_multicast(struct net_device *ndev)
else
and_mask &= ~(RFCR_AAU | RFCR_AAM);
else
and_mask &= ~(RFCR_AAU | RFCR_AAM);
- if (ndev->flags & IFF_ALLMULTI || n
dev->mc_count
)
+ if (ndev->flags & IFF_ALLMULTI || n
etdev_mc_count(ndev)
)
or_mask |= RFCR_AAM;
else
and_mask &= ~RFCR_AAM;
or_mask |= RFCR_AAM;
else
and_mask &= ~RFCR_AAM;
@@
-2292,7
+2292,7
@@
static void __devexit ns83820_remove_one(struct pci_dev *pci_dev)
pci_set_drvdata(pci_dev, NULL);
}
pci_set_drvdata(pci_dev, NULL);
}
-static
struct pci_device_id ns83820_pci_tbl[]
= {
+static
DEFINE_PCI_DEVICE_TABLE(ns83820_pci_tbl)
= {
{ 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, },
{ 0, },
};
{ 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, },
{ 0, },
};