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
dl2k: BMSR fixes
[safe/jmp/linux-2.6]
/
drivers
/
net
/
8139too.c
diff --git
a/drivers/net/8139too.c
b/drivers/net/8139too.c
index
7ba470e
..
eef6fec
100644
(file)
--- a/
drivers/net/8139too.c
+++ b/
drivers/net/8139too.c
@@
-73,7
+73,7
@@
Jean-Jacques Michel - bug fix
Jean-Jacques Michel - bug fix
- Tobias Ringstr
ö
m - Rx interrupt status checking suggestion
+ Tobias Ringstr
ö
m - Rx interrupt status checking suggestion
Andrew Morton - Clear blocked signals, avoid
buffer overrun setting current->comm.
Andrew Morton - Clear blocked signals, avoid
buffer overrun setting current->comm.
@@
-766,7
+766,6
@@
static int __devinit rtl8139_init_board (struct pci_dev *pdev,
dev_err(&pdev->dev, "Unable to alloc new net device\n");
return -ENOMEM;
}
dev_err(&pdev->dev, "Unable to alloc new net device\n");
return -ENOMEM;
}
- SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
tp = netdev_priv(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
tp = netdev_priv(dev);
@@
-927,6
+926,7
@@
static int __devinit rtl8139_init_one (struct pci_dev *pdev,
int i, addr_len, option;
void __iomem *ioaddr;
static int board_idx = -1;
int i, addr_len, option;
void __iomem *ioaddr;
static int board_idx = -1;
+ DECLARE_MAC_BUF(mac);
assert (pdev != NULL);
assert (ent != NULL);
assert (pdev != NULL);
assert (ent != NULL);
@@
-1018,14
+1018,11
@@
static int __devinit rtl8139_init_one (struct pci_dev *pdev,
pci_set_drvdata (pdev, dev);
printk (KERN_INFO "%s: %s at 0x%lx, "
pci_set_drvdata (pdev, dev);
printk (KERN_INFO "%s: %s at 0x%lx, "
- "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
- "IRQ %d\n",
+ "%s, IRQ %d\n",
dev->name,
board_info[ent->driver_data].name,
dev->base_addr,
dev->name,
board_info[ent->driver_data].name,
dev->base_addr,
- dev->dev_addr[0], dev->dev_addr[1],
- dev->dev_addr[2], dev->dev_addr[3],
- dev->dev_addr[4], dev->dev_addr[5],
+ print_mac(mac, dev->dev_addr),
dev->irq);
printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n",
dev->irq);
printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n",
@@
-2409,9
+2406,14
@@
static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs,
}
#endif /* CONFIG_8139TOO_MMIO */
}
#endif /* CONFIG_8139TOO_MMIO */
-static int rtl8139_get_s
tats_count(struct net_device *dev
)
+static int rtl8139_get_s
set_count(struct net_device *dev, int sset
)
{
{
- return RTL_NUM_STATS;
+ switch (sset) {
+ case ETH_SS_STATS:
+ return RTL_NUM_STATS;
+ default:
+ return -EOPNOTSUPP;
+ }
}
static void rtl8139_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data)
}
static void rtl8139_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data)
@@
-2442,7
+2444,7
@@
static const struct ethtool_ops rtl8139_ethtool_ops = {
.get_wol = rtl8139_get_wol,
.set_wol = rtl8139_set_wol,
.get_strings = rtl8139_get_strings,
.get_wol = rtl8139_get_wol,
.set_wol = rtl8139_set_wol,
.get_strings = rtl8139_get_strings,
- .get_s
tats_count = rtl8139_get_stats
_count,
+ .get_s
set_count = rtl8139_get_sset
_count,
.get_ethtool_stats = rtl8139_get_ethtool_stats,
};
.get_ethtool_stats = rtl8139_get_ethtool_stats,
};