projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwlwifi: Recover TX flow stall due to stuck queue
[deliverable/linux.git]
/
drivers
/
net
/
defxx.c
diff --git
a/drivers/net/defxx.c
b/drivers/net/defxx.c
index 6a6ea038d7a31df972cf0ff839888a4679e9c7b7..ed53a8d45f4e5e8c43240b66ac0804e1cf461950 100644
(file)
--- a/
drivers/net/defxx.c
+++ b/
drivers/net/defxx.c
@@
-1052,12
+1052,9
@@
static int __devinit dfx_driver_init(struct net_device *dev,
board_name = "DEFEA";
if (dfx_bus_pci)
board_name = "DEFPA";
board_name = "DEFEA";
if (dfx_bus_pci)
board_name = "DEFPA";
- pr_info("%s: %s at %saddr = 0x%llx, IRQ = %d, "
- "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n",
+ pr_info("%s: %s at %saddr = 0x%llx, IRQ = %d, Hardware addr = %pMF\n",
print_name, board_name, dfx_use_mmio ? "" : "I/O ",
print_name, board_name, dfx_use_mmio ? "" : "I/O ",
- (long long)bar_start, dev->irq,
- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+ (long long)bar_start, dev->irq, dev->dev_addr);
/*
* Get memory for descriptor block, consumer block, and other buffers
/*
* Get memory for descriptor block, consumer block, and other buffers
@@
-2230,7
+2227,7
@@
static void dfx_ctl_set_multicast_list(struct net_device *dev)
* perfect filtering will be used.
*/
* perfect filtering will be used.
*/
- if (
dev->mc_count
> (PI_CMD_ADDR_FILTER_K_SIZE - bp->uc_count))
+ if (
netdev_mc_count(dev)
> (PI_CMD_ADDR_FILTER_K_SIZE - bp->uc_count))
{
bp->group_prom = PI_FSTATE_K_PASS; /* Enable LLC group prom mode */
bp->mc_count = 0; /* Don't add mc addrs to CAM */
{
bp->group_prom = PI_FSTATE_K_PASS; /* Enable LLC group prom mode */
bp->mc_count = 0; /* Don't add mc addrs to CAM */
@@
-2238,17
+2235,16
@@
static void dfx_ctl_set_multicast_list(struct net_device *dev)
else
{
bp->group_prom = PI_FSTATE_K_BLOCK; /* Disable LLC group prom mode */
else
{
bp->group_prom = PI_FSTATE_K_BLOCK; /* Disable LLC group prom mode */
- bp->mc_count =
dev->mc_count;
/* Add mc addrs to CAM */
+ bp->mc_count =
netdev_mc_count(dev);
/* Add mc addrs to CAM */
}
/* Copy addresses to multicast address table, then update adapter CAM */
}
/* Copy addresses to multicast address table, then update adapter CAM */
- dmi = dev->mc_list; /* point to first multicast addr */
- for (i=0; i < bp->mc_count; i++)
- {
- memcpy(&bp->mc_table[i*FDDI_K_ALEN], dmi->dmi_addr, FDDI_K_ALEN);
- dmi = dmi->next; /* point to next multicast addr */
- }
+ i = 0;
+ netdev_for_each_mc_addr(dmi, dev)
+ memcpy(&bp->mc_table[i++ * FDDI_K_ALEN],
+ dmi->dmi_addr, FDDI_K_ALEN);
+
if (dfx_ctl_update_cam(bp) != DFX_K_SUCCESS)
{
DBG_printk("%s: Could not update multicast address table!\n", dev->name);
if (dfx_ctl_update_cam(bp) != DFX_K_SUCCESS)
{
DBG_printk("%s: Could not update multicast address table!\n", dev->name);
@@
-3631,7
+3627,7
@@
static int __devinit dfx_pci_register(struct pci_dev *,
const struct pci_device_id *);
static void __devexit dfx_pci_unregister(struct pci_dev *);
const struct pci_device_id *);
static void __devexit dfx_pci_unregister(struct pci_dev *);
-static
struct pci_device_id dfx_pci_table[]
= {
+static
DEFINE_PCI_DEVICE_TABLE(dfx_pci_table)
= {
{ PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI) },
{ }
};
{ PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI) },
{ }
};
This page took
0.024846 seconds
and
5
git commands to generate.