git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
net
/
hamachi.c
diff --git
a/drivers/net/hamachi.c
b/drivers/net/hamachi.c
index
409c6aa
..
0ea4cb4
100644
(file)
--- a/
drivers/net/hamachi.c
+++ b/
drivers/net/hamachi.c
@@
-20,15
+20,22
@@
Support and updates available at
http://www.scyld.com/network/hamachi.html
Support and updates available at
http://www.scyld.com/network/hamachi.html
- [link no longer provides useful info -jgarzik]
or
http://www.parl.clemson.edu/~keithu/hamachi.html
or
http://www.parl.clemson.edu/~keithu/hamachi.html
+
+
+ Linux kernel changelog:
+
+ LK1.0.1:
+ - fix lack of pci_dev<->dev association
+ - ethtool support (jgarzik)
+
*/
#define DRV_NAME "hamachi"
*/
#define DRV_NAME "hamachi"
-#define DRV_VERSION "
2.0
"
-#define DRV_RELDATE "
June 27, 2006
"
+#define DRV_VERSION "
1.01+LK1.0.1
"
+#define DRV_RELDATE "
5/18/2001
"
/* A few user-configurable values. */
/* A few user-configurable values. */
@@
-601,8
+608,7
@@
static int __devinit hamachi_init_one (struct pci_dev *pdev,
pci_set_master(pdev);
i = pci_request_regions(pdev, DRV_NAME);
pci_set_master(pdev);
i = pci_request_regions(pdev, DRV_NAME);
- if (i)
- return i;
+ if (i) return i;
irq = pdev->irq;
ioaddr = ioremap(base, 0x400);
irq = pdev->irq;
ioaddr = ioremap(base, 0x400);
@@
-865,7
+871,7
@@
static int hamachi_open(struct net_device *dev)
u32 rx_int_var, tx_int_var;
u16 fifo_info;
u32 rx_int_var, tx_int_var;
u16 fifo_info;
- i = request_irq(dev->irq, &hamachi_interrupt,
IRQF_SHARED
, dev->name, dev);
+ i = request_irq(dev->irq, &hamachi_interrupt,
SA_SHIRQ
, dev->name, dev);
if (i)
return i;
if (i)
return i;