2003-08-11 14:25:17

by Dave Jones

Subject: [PATCH] misc 3c505 bits

- Remove unneeded breaks
- Fix double spin_unlock_irqrestore problem

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/3c505.c linux-2.5/drivers/net/3c505.c
--- bk-linus/drivers/net/3c505.c 2003-05-26 12:57:43.000000000 +0100
+++ linux-2.5/drivers/net/3c505.c 2003-06-04 14:07:40.000000000 +0100
@@ -449,18 +449,18 @@ static int send_pcb(struct net_device *d
case ASF_PCB_ACK:
adapter->send_pcb_semaphore = 0;
return TRUE;
- break;
+
case ASF_PCB_NAK:
#ifdef ELP_DEBUG
printk(KERN_DEBUG "%s: send_pcb got NAK\n", dev->name);
#endif
goto abort;
- break;
}
}

if (elp_debug >= 1)
printk(KERN_DEBUG "%s: timeout waiting for PCB acknowledge (status %02x)\n", dev->name, inb_status(dev->base_addr));
+ goto abort;

sti_abort:
spin_unlock_irqrestore(&adapter->lock, flags);

2003-08-11 14:51:58

by Jeff Garzik

Subject: Re: [PATCH] misc 3c505 bits

On Mon, Aug 11, 2003 at 10:49:33AM -0400, Jeff Garzik wrote:
> Disagree: borks message. You receive an ACK, and print "got NAK".

ENOCAFFEINE. Nevermind. I am wrong.

Jeff

2003-08-11 14:51:58

by Jeff Garzik

Subject: Re: [PATCH] misc 3c505 bits

On Mon, Aug 11, 2003 at 02:40:25PM +0100, [email protected] wrote:
> - Remove unneeded breaks
> - Fix double spin_unlock_irqrestore problem
>
> diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/3c505.c linux-2.5/drivers/net/3c505.c
> --- bk-linus/drivers/net/3c505.c 2003-05-26 12:57:43.000000000 +0100
> +++ linux-2.5/drivers/net/3c505.c 2003-06-04 14:07:40.000000000 +0100
> @@ -449,18 +449,18 @@ static int send_pcb(struct net_device *d
> case ASF_PCB_ACK:
> adapter->send_pcb_semaphore = 0;
> return TRUE;
> - break;
> +
> case ASF_PCB_NAK:
> #ifdef ELP_DEBUG
> printk(KERN_DEBUG "%s: send_pcb got NAK\n", dev->name);
> #endif
> goto abort;
> - break;

Disagree: borks message. You receive an ACK, and print "got NAK".

Jeff