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
ide: fix ide_find_dma_mode() to print human-readable info
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ni5010.c
diff --git
a/drivers/net/ni5010.c
b/drivers/net/ni5010.c
index
1dc74a7
..
a20005c
100644
(file)
--- a/
drivers/net/ni5010.c
+++ b/
drivers/net/ni5010.c
@@
-203,6
+203,7
@@
static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
unsigned int data = 0;
int boguscount = 40;
int err = -ENODEV;
unsigned int data = 0;
int boguscount = 40;
int err = -ENODEV;
+ DECLARE_MAC_BUF(mac);
dev->base_addr = ioaddr;
dev->irq = irq;
dev->base_addr = ioaddr;
dev->irq = irq;
@@
-268,8
+269,9
@@
static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
for (i=0; i<6; i++) {
outw(i, IE_GP);
for (i=0; i<6; i++) {
outw(i, IE_GP);
-
printk("%2.2x ", dev->dev_addr[i] = inb(IE_SAPROM)
);
+
dev->dev_addr[i] = inb(IE_SAPROM
);
}
}
+ printk("%s ", print_mac(mac, dev->dev_addr));
PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
@@
-516,7
+518,6
@@
static void dump_packet(void *buf, int len)
/* We have a good packet, get it out of the buffer. */
static void ni5010_rx(struct net_device *dev)
{
/* We have a good packet, get it out of the buffer. */
static void ni5010_rx(struct net_device *dev)
{
- struct ni5010_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr;
unsigned char rcv_stat;
struct sk_buff *skb;
int ioaddr = dev->base_addr;
unsigned char rcv_stat;
struct sk_buff *skb;
@@
-575,7
+576,6
@@
static void ni5010_rx(struct net_device *dev)
PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n",
dev->name, i_pkt_size));
PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n",
dev->name, i_pkt_size));
-
}
static int process_xmt_interrupt(struct net_device *dev)
}
static int process_xmt_interrupt(struct net_device *dev)