From: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
To: Marcelo Tosatti <marcelo@conectiva.com.br>,
Linus Torvalds <torvalds@transmeta.com>
Cc: linux-kernel@vger.kernel.org, Michael Westermann <mw@microdata-pos.de>
Subject: [PATCH] eepro 0.13a
Date: Tue, 30 Jul 2002 09:56:01 -0300 [thread overview]
Message-ID: <20020730125601.GT16077@cathedrallabs.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
these changes was sent by Michael Westermann.
changelog:
* in memory shortage, drop the packet also in board
* remove KERN_ macros in printk calls that doesn't start a new line
--
aris
[-- Attachment #2: eepro-2.2-0.13a.diff --]
[-- Type: text/plain, Size: 2414 bytes --]
--- linux-2.2.21/drivers/net/eepro.c.old Tue Jul 30 09:27:55 2002
+++ linux-2.2.21/drivers/net/eepro.c Tue Jul 30 09:32:48 2002
@@ -23,6 +23,8 @@
This is a compatibility hardware problem.
Versions:
+ 0.13a in memory shortage, drop packets also in board
+ (Michael Westermann <mw@microdata-pos.de>, 07/30/2002)
0.13 irq sharing, rewrote probe function, fixed a nasty bug in
hardware_send_packet and a major cleanup (aris, 11/08/2001)
0.12d tottaly isolated old code to new code (blue cards).
@@ -633,37 +633,37 @@
i = inb(dev->base_addr + ID_REG);
printk(KERN_DEBUG " id: %#x ",i);
- printk(KERN_DEBUG " io: %#x ", (unsigned)dev->base_addr);
+ printk(" io: %#x ", (unsigned)dev->base_addr);
switch (lp->eepro) {
case LAN595FX_10ISA:
- printk(KERN_INFO "%s: Intel EtherExpress 10 ISA\n at %#x,",
+ printk("%s: Intel EtherExpress 10 ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595FX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
+ printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595TX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10 ISA at %#x,",
+ printk("%s: Intel EtherExpress Pro/10 ISA at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595:
- printk(KERN_INFO "%s: Intel 82595-based lan card at %#x,",
+ printk("%s: Intel 82595-based lan card at %#x,",
dev->name, (unsigned)dev->base_addr);
}
for (i=0; i < 6; i++)
- printk(KERN_INFO "%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
+ printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
if (net_debug > 3)
printk(KERN_DEBUG ", %dK RCV buffer",
(int)(lp->rcv_ram)/1024);
if (dev->irq > 2)
- printk(KERN_INFO ", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
+ printk(", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
else
- printk(KERN_INFO ", %s.\n", ifmap[dev->if_port]);
+ printk(", %s.\n", ifmap[dev->if_port]);
if (net_debug > 3) {
i = read_eeprom(dev->base_addr, 5, dev);
@@ -1548,6 +1550,10 @@
if (skb == NULL) {
printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
lp->stats.rx_dropped++;
+ rcv_car = lp->rx_start + RCV_HEADER + rcv_size;
+ lp->rx_start = rcv_next_frame;
+ outw(rcv_next_frame, ioaddr + HOST_ADDRESS_REG);
+
break;
}
skb->dev = dev;
[-- Attachment #3: eepro-2.4-0.13a.diff --]
[-- Type: text/plain, Size: 2439 bytes --]
--- linux-2.4.19-pre/drivers/net/eepro.c.old Tue Jul 30 09:36:08 2002
+++ linux-2.4.19-pre/drivers/net/eepro.c Tue Jul 30 09:34:54 2002
@@ -23,6 +23,8 @@
This is a compatibility hardware problem.
Versions:
+ 0.13a in memory shortage, drop packets also in board
+ (Michael Westermann <mw@microdata-pos.de>, 07/30/2002)
0.13 irq sharing, rewrote probe function, fixed a nasty bug in
hardware_send_packet and a major cleanup (aris, 11/08/2001)
0.12d fixing a problem with single card detected as eight eth devices
@@ -633,37 +633,37 @@
i = inb(dev->base_addr + ID_REG);
printk(KERN_DEBUG " id: %#x ",i);
- printk(KERN_DEBUG " io: %#x ", (unsigned)dev->base_addr);
+ printk(" io: %#x ", (unsigned)dev->base_addr);
switch (lp->eepro) {
case LAN595FX_10ISA:
- printk(KERN_INFO "%s: Intel EtherExpress 10 ISA\n at %#x,",
+ printk("%s: Intel EtherExpress 10 ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595FX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
+ printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595TX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10 ISA at %#x,",
+ printk("%s: Intel EtherExpress Pro/10 ISA at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595:
- printk(KERN_INFO "%s: Intel 82595-based lan card at %#x,",
+ printk("%s: Intel 82595-based lan card at %#x,",
dev->name, (unsigned)dev->base_addr);
}
for (i=0; i < 6; i++)
- printk(KERN_INFO "%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
+ printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
if (net_debug > 3)
printk(KERN_DEBUG ", %dK RCV buffer",
(int)(lp->rcv_ram)/1024);
if (dev->irq > 2)
- printk(KERN_INFO ", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
+ printk(", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
else
- printk(KERN_INFO ", %s.\n", ifmap[dev->if_port]);
+ printk(", %s.\n", ifmap[dev->if_port]);
if (net_debug > 3) {
i = read_eeprom(dev->base_addr, 5, dev);
@@ -1578,6 +1580,10 @@
if (skb == NULL) {
printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
lp->stats.rx_dropped++;
+ rcv_car = lp->rx_start + RCV_HEADER + rcv_size;
+ lp->rx_start = rcv_next_frame;
+ outw(rcv_next_frame, ioaddr + HOST_ADDRESS_REG);
+
break;
}
skb->dev = dev;
[-- Attachment #4: eepro-2.5-0.13a.diff --]
[-- Type: text/plain, Size: 2432 bytes --]
--- linux-2.5.26/drivers/net/eepro.c.orig Tue Jul 16 20:49:36 2002
+++ linux-2.5.26/drivers/net/eepro.c Tue Jul 30 09:37:00 2002
@@ -23,6 +23,8 @@
This is a compatibility hardware problem.
Versions:
+ 0.13a in memory shortage, drop packets also in board
+ (Michael Westermann <mw@microdata-pos.de>, 07/30/2002)
0.13 irq sharing, rewrote probe function, fixed a nasty bug in
hardware_send_packet and a major cleanup (aris, 11/08/2001)
0.12d fixing a problem with single card detected as eight eth devices
@@ -633,37 +633,37 @@
i = inb(dev->base_addr + ID_REG);
printk(KERN_DEBUG " id: %#x ",i);
- printk(KERN_DEBUG " io: %#x ", (unsigned)dev->base_addr);
+ printk(" io: %#x ", (unsigned)dev->base_addr);
switch (lp->eepro) {
case LAN595FX_10ISA:
- printk(KERN_INFO "%s: Intel EtherExpress 10 ISA\n at %#x,",
+ printk("%s: Intel EtherExpress 10 ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595FX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
+ printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595TX:
- printk(KERN_INFO "%s: Intel EtherExpress Pro/10 ISA at %#x,",
+ printk("%s: Intel EtherExpress Pro/10 ISA at %#x,",
dev->name, (unsigned)dev->base_addr);
break;
case LAN595:
- printk(KERN_INFO "%s: Intel 82595-based lan card at %#x,",
+ printk("%s: Intel 82595-based lan card at %#x,",
dev->name, (unsigned)dev->base_addr);
}
for (i=0; i < 6; i++)
- printk(KERN_INFO "%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
+ printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
if (net_debug > 3)
printk(KERN_DEBUG ", %dK RCV buffer",
(int)(lp->rcv_ram)/1024);
if (dev->irq > 2)
- printk(KERN_INFO ", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
+ printk(", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
else
- printk(KERN_INFO ", %s.\n", ifmap[dev->if_port]);
+ printk(", %s.\n", ifmap[dev->if_port]);
if (net_debug > 3) {
i = read_eeprom(dev->base_addr, 5, dev);
@@ -1584,6 +1586,10 @@
if (skb == NULL) {
printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
lp->stats.rx_dropped++;
+ rcv_car = lp->rx_start + RCV_HEADER + rcv_size;
+ lp->rx_start = rcv_next_frame;
+ outw(rcv_next_frame, ioaddr + HOST_ADDRESS_REG);
+
break;
}
skb->dev = dev;
next reply other threads:[~2002-07-30 12:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-07-30 12:56 Aristeu Sergio Rozanski Filho [this message]
[not found] <20020730125601.GT16077@cathedrallabs.org.suse.lists.linux.kernel>
2002-07-30 13:35 ` Andi Kleen
2002-07-30 13:48 ` Aristeu Sergio Rozanski Filho
2002-07-30 14:13 ` Andi Kleen
2002-07-30 13:56 ` Andreas Schwab
2002-07-30 14:04 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020730125601.GT16077@cathedrallabs.org \
--to=aris@cathedrallabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
--cc=mw@microdata-pos.de \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®