diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
| commit | 1a0153507ffae9cf3350e76c12d441788c0191e1 (patch) | |
| tree | d05a502b4fc05202c84c1667019460c08ea088cd /drivers/net/hamachi.c | |
| parent | b0683ac8928c4cf40646a6ce3eb6ffe94605acfa (diff) | |
v2.4.3.2 -> v2.4.3.3
- Hui-Fen Hsu: sis900 driver update
- NIIBE Yutaka: Super-H update
- Alan Cox: more resyncs (ARM down, but more to go)
- David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc.
- David Miller/me: get rid of various drivers hacks to do mmap
alignment behind the back of the VM layer. Create a real
protocol for it.
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 8997b82801da..2b123e696e50 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -44,7 +44,7 @@ static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */ #define hamachi_debug debug /* Maximum events (Rx packets, etc.) to handle at each interrupt. */ static int max_interrupt_work = 40; -static int mtu = 0; +static int mtu; /* Default values selected by testing on a dual processor PIII-450 */ /* These six interrupt control parameters may be set directly when loading the * module, or through the rx_params and tx_params variables @@ -60,13 +60,13 @@ static int min_tx_pkt = 0x30; -Setting to > 1518 causes all frames to be copied -Setting to 0 disables copies */ -static int rx_copybreak = 0; +static int rx_copybreak; /* An override for the hardware detection of bus width. Set to 1 to force 32 bit PCI bus detection. Set to 4 to force 64 bit. Add 2 to disable parity detection. */ -static int force32 = 0; +static int force32; /* Used to pass the media type, etc. @@ -548,13 +548,13 @@ static void set_rx_mode(struct net_device *dev); static int __init hamachi_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { - static int did_version = 0; /* Already printed version info. */ + static int did_version; /* Already printed version info. */ struct hamachi_private *hmp; int option, i, rx_int_var, tx_int_var, boguscnt; int chip_id = ent->driver_data; int irq; long ioaddr; - static int card_idx = 0; + static int card_idx; struct net_device *dev; if (hamachi_debug > 0 && did_version++ == 0) |