[parisc-linux-cvs] DIFF 2.4.20-rc1-pa7

[Grant Grundler]

Grant Grundler wrote:
> Log message:
> 2.4.20-rc1-pa7
> o acenic: remove replicated chunk of code - looks like merge breakage
> o ppp_generic: fix "uninitialized use" warning

Thanks to Joel (Soete?) for pointing out these.

grant


Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.366
diff -u -p -r1.366 Makefile
--- Makefile	17 Nov 2002 20:44:11 -0000	1.366
+++ Makefile	22 Nov 2002 05:53:55 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 20
-EXTRAVERSION = -rc1-pa6
+EXTRAVERSION = -rc1-pa7
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/net/acenic.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/acenic.c,v
retrieving revision 1.19
diff -u -p -r1.19 acenic.c
--- drivers/net/acenic.c	14 Nov 2002 06:38:05 -0000	1.19
+++ drivers/net/acenic.c	22 Nov 2002 05:53:55 -0000
@@ -188,13 +188,6 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl)
 #define ACE_MOD_DEC_USE_COUNT		do{} while(0)
 #endif
 
-
-#if LINUX_VERSION_CODE >= 0x2051c
-#define ace_sync_irq(irq)	synchronize_irq(irq)
-#else
-#define ace_sync_irq(irq)	synchronize_irq()
-#endif
-
 #if LINUX_VERSION_CODE < 0x20414
 #define local_irq_save(flags)		do{__save_flags(flags) ; \
 					   __cli();} while(0)
Index: drivers/net/ppp_generic.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/ppp_generic.c,v
retrieving revision 1.14
diff -u -p -r1.14 ppp_generic.c
--- drivers/net/ppp_generic.c	13 Nov 2002 16:57:46 -0000	1.14
+++ drivers/net/ppp_generic.c	22 Nov 2002 05:53:55 -0000
@@ -387,9 +387,9 @@ static ssize_t ppp_read(struct file *fil
 	for (;;) {
 		set_current_state(TASK_INTERRUPTIBLE);
 		skb = skb_dequeue(&pf->rq);
+		ret = 0;
 		if (skb)
 			break;
-		ret = 0;
 		if (pf->dead)
 			break;
 		ret = -EAGAIN;