diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/sk_mca.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/sk_mca.c')
| -rw-r--r-- | drivers/net/sk_mca.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c index 799e0980193..37b88da1abe 100644 --- a/drivers/net/sk_mca.c +++ b/drivers/net/sk_mca.c @@ -1,4 +1,4 @@ -/* +/* net-3-driver for the SKNET MCA-based cards This is an extension to the Linux operating system, and is covered by the @@ -10,9 +10,9 @@ Copyright 1999 by Alfred Arnold (alfred@ccac.rwth-aachen.de, This driver is based both on the 3C523 driver and the SK_G16 driver. paper sources: - 'PC Hardware: Aufbau, Funktionsweise, Programmierung' by + 'PC Hardware: Aufbau, Funktionsweise, Programmierung' by Hans-Peter Messmer for the basic Microchannel stuff - + 'Linux Geraetetreiber' by Allesandro Rubini, Kalle Dalheimer for help on Ethernet driver programming @@ -24,7 +24,7 @@ paper sources: 'SK-NET MC2+ Technical Manual", Version 1.1 by Schneider&Koch for documentation on the MC2 bord - + A big thank you to the S&K support for providing me so quickly with documentation! @@ -34,7 +34,7 @@ paper sources: -> set debug level via ioctl instead of compile-time switches -> I didn't follow the development of the 2.1.x kernels, so my - assumptions about which things changed with which kernel version + assumptions about which things changed with which kernel version are probably nonsense History: @@ -57,7 +57,7 @@ History: fixed problem in GetLANCE leaving interrupts turned off increase TX queue to 4 packets to improve send performance May 29th, 1999 - a few corrections in statistics, caught rcvr overruns + a few corrections in statistics, caught rcvr overruns reinitialization of LANCE/board in critical situations MCA info implemented implemented LANCE multicast filter @@ -427,7 +427,7 @@ static void InitLANCE(struct net_device *dev) InitDscrs(dev); /* next RX descriptor to be read is the first one. Since the LANCE - will start from the beginning after initialization, we have to + will start from the beginning after initialization, we have to reset out pointers too. */ priv->nextrx = 0; @@ -868,7 +868,7 @@ static int skmca_tx(struct sk_buff *skb, struct net_device *dev) int tmplen, retval = 0; unsigned long flags; - /* if we get called with a NULL descriptor, the Ethernet layer thinks + /* if we get called with a NULL descriptor, the Ethernet layer thinks our card is stuck an we should reset it. We'll do this completely: */ if (skb == NULL) { @@ -896,7 +896,7 @@ static int skmca_tx(struct sk_buff *skb, struct net_device *dev) tmplen = 60; descr.Len = 65536 - tmplen; - /* copy filler into RAM - in case we're filling up... + /* copy filler into RAM - in case we're filling up... we're filling a bit more than necessary, but that doesn't harm since the buffer is far larger... */ if (tmplen > skb->len) { |