Linux 2.4.26-rc1

Linux 2.4.26-rc1

[Marcelo Tosatti]

Finally, -rc1.

The first -rc contains an ACPI update, networking fixes, amongst others.

Please test!

Summary of changes from v2.4.26-pre6 to v2.4.26-rc1
============================================

Chas Williams:
  o [ATM]: [lec] lec_push() races with vcc->proto_data
  o [ATM]: [nicstar] use kernel min/max (by Randy.Dunlap <rddunlap@osdl.org>)

David S. Miller:
  o [IGMP]: Do nothing in ip_mc_down() if ip_mc_up() was not called previously
  o [SPARC64]: Update defconfig

Dmitry Torokhov:
  o [NET_SCHED]: Fix class reporting in TBF qdisc
  o [NET_SCHED]: Trailing whitespace cleanup in TBF scheduler

Jon Oberheide:
  o [CRYPTO]: Remove confusing TODO comment in arc4.c

Julian Anastasov:
  o [IPVS] Fix to update the skb->h.raw after skb reallocation in tunnel_xmit
  o [IPVS] Fix connection rehashing with new cport

Len Brown:
  o [ACPI] PCI interrupt link routing (Luming Yu) use _PRS to determine resource type for _SRS fixes HP Proliant servers http://bugzilla.kernel.org/show_bug.cgi?id=1590
  o [ACPI] proposed fix for non-identity-mapped SCI override http://bugme.osdl.org/show_bug.cgi?id=2366
  o [ACPI] ACPICA 20040326 from Bob Moore
  o [ACPI] Linux specific updates from ACPICA 20040326 "acpi_wake_gpes_always_on" boot flag for old GPE behaviour

Marcel Holtmann:
  o [Bluetooth] Add support for AVM BlueFRITZ! USB v2.0
  o [Bluetooth] Remove non-blocking socket fix

Marcelo Tosatti:
  o Trond: Avoid refile_inode() from putting locked inodes on the dirty list
  o Changed EXTRAVERSION to -rc1

Martin Devera:
  o [NET_SCHED]: HTB scheduler updates

Patrick McHardy:
  o [NET_SCHED]: Fix broken indentation in HFSC scheduler
  o [NET_SCHED]: Fix requeueing in HFSC scheduler
  o [NET_SCHED]: Use queue limit of 1 when tx_queue_len is zero

Sridhar Samudrala:
  o [SCTP] Don't do any ppid byte-order conversions as it is opaque to SCTP
  o [SCTP] Avoid the use of hacking CONFIG_IPV6_SCTP__ option

Stephen Hemminger:
  o [NET_SCHED]: Add packet delay scheduler

Wensong Zhang:
  o [IPVS]: Fix to hold the lock before updating a service

Re: Linux 2.4.26-rc1

[Willy TARREAU]

Hi Marcelo,

It's OK here on dual athlon, alpha is compiling. I identified a few
warnings during the compilation. I'll send a few patches to fix them.
The biggest one is on agpgart, when the agp_generic_* functions are
not used, but fixing this needs a lot of #if and I feel like lazy
right now :-)

Regards,
Willy

[PATCH-2.4.26] ip6tables cleanup

[Willy TARREAU]

Hi Marcelo, all

2.4.26-rc1 returned this warning compiling ip6_tables :

ip6_tables.c: In function `tcp_match':
ip6_tables.c:1596: warning: implicit declaration of function `ipv6_skip_exthdr'

I had to add a cast because ipv6_skip_exthdr() expects a 'struct sk_buff*' while
its caller uses a 'const struct sk_buff*'. Here is a cleanup patch.

Please apply,
Willy

--- ./net/ipv6/netfilter/ip6_tables.c.orig	Sun Mar 28 10:57:08 2004
+++ ./net/ipv6/netfilter/ip6_tables.c	Sun Mar 28 11:15:55 2004
@@ -23,7 +23,7 @@
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 #include <linux/proc_fs.h>
-
+#include <net/ipv6.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
 #define IPV6_HDR_LEN	(sizeof(struct ipv6hdr))
@@ -1593,7 +1593,8 @@
 	}
 
 	tcpoff = (u8*)(skb->nh.ipv6h + 1) - skb->data;
-	tcpoff = ipv6_skip_exthdr(skb, tcpoff, &nexthdr, skb->len - tcpoff);
+	tcpoff = ipv6_skip_exthdr((struct sk_buff *)skb,
+					tcpoff, &nexthdr, skb->len - tcpoff);
 	if (tcpoff < 0 || tcpoff > skb->len) {
 		duprintf("tcp_match: cannot skip exthdr. Dropping.\n");
 		*hotdrop = 1;
@@ -1674,7 +1675,8 @@
 	}
 
 	udpoff = (u8*)(skb->nh.ipv6h + 1) - skb->data;
-	udpoff = ipv6_skip_exthdr(skb, udpoff, &nexthdr, skb->len - udpoff);
+	udpoff = ipv6_skip_exthdr((struct sk_buff *)skb,
+					udpoff, &nexthdr, skb->len - udpoff);
 	if (udpoff < 0 || udpoff > skb->len) {
 		duprintf("udp_match: cannot skip exthdr. Dropping.\n");
 		*hotdrop = 1;

Re: [PATCH-2.4.26] ip6tables cleanup

[Peter Osterlund]

Willy TARREAU <willy@w.ods.org> writes:

> 2.4.26-rc1 returned this warning compiling ip6_tables :
> 
> ip6_tables.c: In function `tcp_match':
> ip6_tables.c:1596: warning: implicit declaration of function `ipv6_skip_exthdr'
> 
> I had to add a cast because ipv6_skip_exthdr() expects a 'struct sk_buff*' while
> its caller uses a 'const struct sk_buff*'. Here is a cleanup patch.

I think it would be better to change the ipv6_skip_exthdr() function
to take a const struct sk_buff* instead. Unnecessary casts are evil.

-- 
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340

Re: [PATCH-2.4.26] ip6tables cleanup

[Willy TARREAU]

On Sun, Mar 28, 2004 at 09:27:09PM +0200, Peter Osterlund wrote:
> Willy TARREAU <willy@w.ods.org> writes:
> 
> > 2.4.26-rc1 returned this warning compiling ip6_tables :
> > 
> > ip6_tables.c: In function `tcp_match':
> > ip6_tables.c:1596: warning: implicit declaration of function `ipv6_skip_exthdr'
> > 
> > I had to add a cast because ipv6_skip_exthdr() expects a 'struct sk_buff*' while
> > its caller uses a 'const struct sk_buff*'. Here is a cleanup patch.
> 
> I think it would be better to change the ipv6_skip_exthdr() function
> to take a const struct sk_buff* instead. Unnecessary casts are evil.

At first I didn't want to do this because it would have needed to recurse
down to other users of skb. But I've just checked and noticed that indeed,
only skb_copy_bits() uses the skb, and this one already expects a const. So
you're right, and I should have checked further. My bad.

Marcelo, could you please use this simpler patch instead ?

Thanks,
Willy

diff -urN linux-2.4.26-rc1/net/ipv6/exthdrs.c linux-2.4.26-rc1-skb/net/ipv6/exthdrs.c
--- linux-2.4.26-rc1/net/ipv6/exthdrs.c	Sat Mar 20 10:08:21 2004
+++ linux-2.4.26-rc1-skb/net/ipv6/exthdrs.c	Sun Mar 28 22:07:21 2004
@@ -783,7 +783,7 @@
  * --ANK (980726)
  */
 
-int ipv6_skip_exthdr(struct sk_buff *skb, int start, u8 *nexthdrp, int len)
+int ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp, int len)
 {
 	u8 nexthdr = *nexthdrp;
 

Re: [PATCH-2.4.26] ip6tables cleanup

[David S. Miller]

On Sun, 28 Mar 2004 22:09:32 +0200
Willy TARREAU <willy@w.ods.org> wrote:

> Marcelo, could you please use this simpler patch instead ?

I'll take care of this Willy, and I'd really like you to submit
networking patches in the future to me directly anyways :-)

Thanks.

Re: [PATCH-2.4.26] ip6tables cleanup

[Willy TARREAU]

David,

I sent last one too quickly, it needs this one to compile :

diff -urN linux-2.4.26-rc1/include/net/ipv6.h linux-2.4.26-rc1-ipv6/include/net/ipv6.h
--- linux-2.4.26-rc1/include/net/ipv6.h	Mon Mar 29 00:18:38 2004
+++ linux-2.4.26-rc1-ipv6/include/net/ipv6.h	Mon Mar 29 00:36:39 2004
@@ -321,8 +321,8 @@
 						    struct ipv6_txoptions *opt,
 						    u8 *proto);
 
-extern int			ipv6_skip_exthdr(struct sk_buff *, int start,
-					         u8 *nexthdrp, int len);
+extern int			ipv6_skip_exthdr(const struct sk_buff *,
+					int start, u8 *nexthdrp, int len);
 
 extern int 			ipv6_ext_hdr(u8 nexthdr);
 

Sorry for the noise,
Willy

Re: [PATCH-2.4.26] ip6tables cleanup

[David S. Miller]

On Mon, 29 Mar 2004 00:38:05 +0200
Willy TARREAU <willy@w.ods.org> wrote:

> I sent last one too quickly, it needs this one to compile :

I know, I fixed this already when I tried to compile your
original version :-)

Thanks.

Re: [PATCH-2.4.26] ip6tables cleanup

[David S. Miller]

On 28 Mar 2004 21:27:09 +0200
Peter Osterlund <petero2@telia.com> wrote:

> Willy TARREAU <willy@w.ods.org> writes:
> 
> > 2.4.26-rc1 returned this warning compiling ip6_tables :
> > 
> > ip6_tables.c: In function `tcp_match':
> > ip6_tables.c:1596: warning: implicit declaration of function `ipv6_skip_exthdr'
> > 
> > I had to add a cast because ipv6_skip_exthdr() expects a 'struct sk_buff*' while
> > its caller uses a 'const struct sk_buff*'. Here is a cleanup patch.
> 
> I think it would be better to change the ipv6_skip_exthdr() function
> to take a const struct sk_buff* instead. Unnecessary casts are evil.

Yes, and I believe this is how I fixed this warning in the 2.6.x
tree.

[PATCH-2.4.26] cmpci cleanup

[Willy TARREAU]

Hi Marcelo,

compiling cmpci in 2.4.26-rc1 complains :

cmpci.c: In function `cm_probe':
cmpci.c:3308: warning: unused variable `reg_mask'

Here is the patch. Please apply,
Willy

--- ./drivers/sound/cmpci.c.orig	Sun Mar 28 11:19:12 2004
+++ ./drivers/sound/cmpci.c	Sun Mar 28 11:19:44 2004
@@ -3305,7 +3305,6 @@
 	struct cm_state *s;
 	mm_segment_t fs;
 	int i, val, ret;
-	unsigned char reg_mask = 0;
 	struct {
 		unsigned short	deviceid;
 		char		*devicename;
@@ -3381,6 +3380,7 @@
 		printk(KERN_ERR "cmpci: io ports %#x-%#x in use\n", s->iomidi, s->iomidi+CM_EXTENT_MIDI-1);
 		s->iomidi = 0;
 	    } else {
+		unsigned char reg_mask = 0;
 		/* set IO based at 0x330 */
 		switch (s->iomidi) {
 		    case 0x330:
@@ -3415,6 +3415,7 @@
 		printk(KERN_ERR "cmpci: io ports %#x-%#x in use\n", s->iosynth, s->iosynth+CM_EXTENT_SYNTH-1);
 		s->iosynth = 0;
 	    } else {
+		unsigned char reg_mask = 0;
 		/* set IO based at 0x388 */
 		switch (s->iosynth) {
 		    case 0x388:

Re: [PATCH-2.4.26] cmpci cleanup

[Marcelo Tosatti]

WIlly,

We have a cmpci update pending and this error is really harmless,
so lets wait on this one.

On Sun, Mar 28, 2004 at 01:57:18PM +0200, Willy TARREAU wrote:
> Hi Marcelo,
> 
> compiling cmpci in 2.4.26-rc1 complains :
> 
> cmpci.c: In function `cm_probe':
> cmpci.c:3308: warning: unused variable `reg_mask'
> 
> Here is the patch. Please apply,
> Willy
> 
> --- ./drivers/sound/cmpci.c.orig	Sun Mar 28 11:19:12 2004
> +++ ./drivers/sound/cmpci.c	Sun Mar 28 11:19:44 2004
> @@ -3305,7 +3305,6 @@
>  	struct cm_state *s;
>  	mm_segment_t fs;
>  	int i, val, ret;
> -	unsigned char reg_mask = 0;
>  	struct {
>  		unsigned short	deviceid;
>  		char		*devicename;
> @@ -3381,6 +3380,7 @@
>  		printk(KERN_ERR "cmpci: io ports %#x-%#x in use\n", s->iomidi, s->iomidi+CM_EXTENT_MIDI-1);
>  		s->iomidi = 0;
>  	    } else {
> +		unsigned char reg_mask = 0;
>  		/* set IO based at 0x330 */
>  		switch (s->iomidi) {
>  		    case 0x330:
> @@ -3415,6 +3415,7 @@
>  		printk(KERN_ERR "cmpci: io ports %#x-%#x in use\n", s->iosynth, s->iosynth+CM_EXTENT_SYNTH-1);
>  		s->iosynth = 0;
>  	    } else {
> +		unsigned char reg_mask = 0;
>  		/* set IO based at 0x388 */
>  		switch (s->iosynth) {
>  		    case 0x388:

[PATCH-2.4.26] smbfs cleanup

[Willy TARREAU]

Hi Marcelo,

Compiling smbfs without CONFIG_SMB_UNIX ouputs a few warnings.
Here's the fix. Please apply.
Willy


--- ./fs/smbfs/proc.c.orig	Sun Mar 28 14:02:27 2004
+++ ./fs/smbfs/proc.c	Sun Mar 28 14:06:59 2004
@@ -49,7 +49,9 @@
 static struct smb_ops smb_ops_os2;
 static struct smb_ops smb_ops_win95;
 static struct smb_ops smb_ops_winNT;
+#ifdef CONFIG_SMB_UNIX
 static struct smb_ops smb_ops_unix;
+#endif
 
 static void
 smb_init_dirent(struct smb_sb_info *server, struct smb_fattr *fattr);
@@ -2636,6 +2638,7 @@
 	return result;
 }
 
+#ifdef CONFIG_SMB_UNIX
 /*
  * Note: called with the server locked.
  */
@@ -2680,6 +2683,7 @@
 out:
 	return result;
 }
+#endif
 
 static int
 smb_proc_getattr_null(struct smb_sb_info *server, struct dentry *dir,
@@ -3332,6 +3336,7 @@
 	.truncate       = smb_proc_trunc64,
 };
 
+#ifdef CONFIG_SMB_UNIX
 /* Samba w/ unix extensions. Others? */
 static struct smb_ops smb_ops_unix =
 {
@@ -3341,6 +3346,7 @@
 	.getattr        = smb_proc_getattr_unix,
 	.truncate       = smb_proc_trunc64,
 };
+#endif
 
 /* Place holder until real ops are in place */
 static struct smb_ops smb_ops_null =

[PATCH-2.4.26] sddr09 cleanup

[Willy TARREAU]

Hi Marcelo,

sddr09 prints a warning about print_heap() which is not used.
I ifdef'ed it out so that is still is usable for debugging
purposes.

Please apply following patch to 2.4.26-rc1.
Willy


--- ./drivers/usb/storage/sddr09.c.orig	Sun Mar 28 14:03:46 2004
+++ ./drivers/usb/storage/sddr09.c	Sun Mar 28 14:04:31 2004
@@ -437,7 +437,6 @@
 
 	return result;
 }
-#endif
 
 /*
  * Request Sense Command: 12 bytes.
@@ -465,6 +464,7 @@
 
 	return result;
 }
+#endif
 
 /*
  * Read Command: 12 bytes.

Re: [PATCH-2.4.26] sddr09 cleanup

[Willy TARREAU]

On Sun, Mar 28, 2004 at 02:15:52PM +0200, Willy TARREAU wrote:
> Hi Marcelo,
> 
> sddr09 prints a warning about print_heap() which is not used.
> I ifdef'ed it out so that is still is usable for debugging
> purposes.

Sorry, I confused it with radeon_mem (which comes next).
For sddr09, it was sddr09_request_sense() which was not used
(only referenced in an ifdef'ed out function). Patch is correct
anyway.

Cheers,
Willy

[PATCH-2.4.26] drm/radeon_mem cleanup

[Willy TARREAU]

Hi Marcelo,

drm/radeon_mem ouputs a warning because print_heap() is never
used in 2.4.26-rc1. I only commented it out to keep it useful
for debugging purposes. Please apply.

Willy

--- ./drivers/char/drm/radeon_mem.c.orig	Sun Mar 28 14:07:38 2004
+++ ./drivers/char/drm/radeon_mem.c	Sun Mar 28 14:08:16 2004
@@ -131,6 +131,7 @@
 	}
 }
 
+#if 0
 static void print_heap( struct mem_block *heap )
 {
 	struct mem_block *p;
@@ -140,6 +141,7 @@
 			  p->start, p->start + p->size,
 			  p->size, p->pid);
 }
+#endif
 
 /* Initialize.  How to check for an uninitialized heap?
  */

[PATCH-2.4.26] cardbus cleanup

[Willy TARREAU]

Hi Marcelo,

in cardbus.c, cb_scan_slot() calls pci_scan_device() which is
undefined. Since it does not appear in any include, I added an
external reference to it in the file to kill the warning.

Please apply.
Willy

--- ./drivers/pcmcia/cardbus.c.orig	Sun Mar 28 13:57:34 2004
+++ ./drivers/pcmcia/cardbus.c	Sun Mar 28 13:59:24 2004
@@ -221,6 +221,8 @@
 	return -1;
 }
 
+extern struct pci_dev * __devinit pci_scan_device(struct pci_dev *temp);
+
 struct pci_dev *cb_scan_slot(struct pci_dev *temp, struct list_head *list)
 {
 	struct pci_dev *dev;

Re: Linux 2.4.26-rc1 => Alpha warnings

[Willy TARREAU]

Hi Marcelo, all,

2.4.26-rc1 compiled correctly on alpha, but I got amongst usual
warnings a strange one (with gcc-3.2.3) :

math.c: In function `alpha_fp_emul':
math.c:204: warning: right shift count is negative
math.c:204: warning: left shift count >= width of type
math.c:220: warning: left shift count is negative
math.c:258: warning: right shift count >= width of type
math.c:258: warning: right shift count >= width of type
math.c:262: warning: right shift count >= width of type
math.c:262: warning: right shift count >= width of type
math.c:238: warning: statement with no effect
math.c:270: warning: statement with no effect
math.c:270: warning: statement with no effect
math.c:270: warning: statement with no effect
math.c:277: warning: statement with no effect
math.c:277: warning: statement with no effect
math.c:277: warning: statement with no effect

The offending code is in ./arch/alpha/math-emu/math.c :

     95 long
     96 alpha_fp_emul (unsigned long pc)
../..
    203                 case FOP_FNC_MULx:
>>> 204                         FP_MUL_D(DR, DA, DB);
    205                         goto pack_d;
    206
    207                 case FOP_FNC_DIVx:
    208                         FP_DIV_D(DR, DA, DB);
    209                         goto pack_d;
    210
    211                 case FOP_FNC_SQRTx:
    212                         FP_SQRT_D(DR, DB);
    213                         goto pack_d;
    214
    215                 case FOP_FNC_CVTxS:
    216                         /* It is irritating that DEC encoded CVTST with
    217                            SRC == T_floating.  It is also interesting that
    218                            the bit used to tell the two apart is /U... */
    219                         if (insn & 0x2000) {
>>> 220                                 FP_CONV(S,D,1,1,SR,DB);
    221                                 goto pack_s;
    222                         } else {
    223                                 vb = alpha_read_fp_reg_s(fb);
    224                                 FP_UNPACK_SP(SB, &vb);
    225                                 DR_c = DB_c;
    226                                 DR_s = DB_s;
    227                                 DR_e = DB_e;
    228                                 DR_f = SB_f << (52 - 23);
    229                                 goto pack_d;
    230                         }
    231
    232                 case FOP_FNC_CVTxQ:
    233                         if (DB_c == FP_CLS_NAN
    234                             && (_FP_FRAC_HIGH_RAW_D(DB) & _FP_QNANBIT_D)) {
    235                           /* AAHB Table B-2 says QNaN should not trigger INV */
    236                                 vc = 0;
    237                         } else
>>> 238                                 FP_TO_INT_ROUND_D(vc, DB, 64, 2);
    239                         goto done_d;
    240                 }
    241                 goto bad_insn;
    242
    243         case FOP_SRC_Q:
    244                 vb = alpha_read_fp_reg(fb);
    245
    246                 switch (func) {
    247                 case FOP_FNC_CVTQL:
    248                         /* Notice: We can get here only due to an integer
    249                            overflow.  Such overflows are reported as invalid
    250                            ops.  We return the result the hw would have
    251                            computed.  */
    252                         vc = ((vb & 0xc0000000) << 32 | /* sign and msb */
    253                               (vb & 0x3fffffff) << 29); /* rest of the int */
    254                         FP_SET_EXCEPTION (FP_EX_INVALID);
    255                         goto done_d;
    256
    257                 case FOP_FNC_CVTxS:
>>> 258                         FP_FROM_INT_S(SR, ((long)vb), 64, long);
    259                         goto pack_s;
    260
    261                 case FOP_FNC_CVTxT:
>>> 262                         FP_FROM_INT_D(DR, ((long)vb), 64, long);
    263                         goto pack_d;
    264                 }
    265                 goto bad_insn;
    266         }
    267         goto bad_insn;
    268
    269 pack_s:
>>> 270         FP_PACK_SP(&vc, SR);
    271         if ((_fex & FP_EX_UNDERFLOW) && (swcr & IEEE_MAP_UMZ))
    272                 vc = 0;
    273         alpha_write_fp_reg_s(fc, vc);
    274         goto done;
    275
    276 pack_d:
>>> 277         FP_PACK_DP(&vc, DR);
    278         if ((_fex & FP_EX_UNDERFLOW) && (swcr & IEEE_MAP_UMZ))
    279                 vc = 0;
    280 done_d:
    281         alpha_write_fp_reg(fc, vc);
    282         goto done;

I didn't understand how this works. Perhaps someone with better alpha skills could
enlighten a bit ?

Cheers,
Willy

Re: Linux 2.4.26-rc1 => Alpha warnings

[Ivan Kokshaysky]

On Sun, Mar 28, 2004 at 02:40:22PM +0200, Willy TARREAU wrote:
> 2.4.26-rc1 compiled correctly on alpha, but I got amongst usual
> warnings a strange one (with gcc-3.2.3) :
> 
> math.c: In function `alpha_fp_emul':
> math.c:204: warning: right shift count is negative
> math.c:204: warning: left shift count >= width of type

These are "usual" too and absolutely harmless.

Ivan.

[PATCH-2.4.26] ATM cleanup

[Willy TARREAU]

Hi Marcelo, Chas,

Compiling ATM from 2.4.26-rc1 on alpha says :

mpoa_proc.c: In function `proc_mpc_read':
mpoa_proc.c:117: warning: passing arg 2 of `atm_mpoa_disp_qos' from incompatible pointer type

117:    atm_mpoa_disp_qos((char *)page, &length); 

it is because length is declared ssize_t (the function's return type),
while atm_mpoa_disp_qos() expects an int. Changing length type to int
clears the warning.

Please apply,
Willy

--- ./net/atm/mpoa_proc.c.orig	Sun Mar 28 14:52:17 2004
+++ ./net/atm/mpoa_proc.c	Sun Mar 28 14:52:34 2004
@@ -102,7 +102,7 @@
 			     size_t count, loff_t *pos){
         unsigned long page = 0;
 	unsigned char *temp;
-        ssize_t length  = 0;
+        int length  = 0;
 	int i = 0;
 	struct mpoa_client *mpc = mpcs;
 	in_cache_entry *in_entry;

Re: [PATCH-2.4.26] ATM cleanup

[Chris Wedgwood]

On Sun, Mar 28, 2004 at 02:58:52PM +0200, Willy TARREAU wrote:

> +++ ./net/atm/mpoa_proc.c	Sun Mar 28 14:52:34 2004
> @@ -102,7 +102,7 @@
>  			     size_t count, loff_t *pos){
>          unsigned long page = 0;
>  	unsigned char *temp;
> -        ssize_t length  = 0;
> +        int length  = 0;
>  	int i = 0;
>  	struct mpoa_client *mpc = mpcs;
>  	in_cache_entry *in_entry;

no tabs?


   --cw

Re: [PATCH-2.4.26] ATM cleanup

[Willy TARREAU]

On Sun, Mar 28, 2004 at 05:03:17AM -0800, Chris Wedgwood wrote:
> On Sun, Mar 28, 2004 at 02:58:52PM +0200, Willy TARREAU wrote:
> 
> > +++ ./net/atm/mpoa_proc.c	Sun Mar 28 14:52:34 2004
> > @@ -102,7 +102,7 @@
> >  			     size_t count, loff_t *pos){
> >          unsigned long page = 0;
> >  	unsigned char *temp;
> > -        ssize_t length  = 0;
> > +        int length  = 0;
> >  	int i = 0;
> >  	struct mpoa_client *mpc = mpcs;
> >  	in_cache_entry *in_entry;
> 
> no tabs?

Good catch, it seems there are many lines without tabs in this file,
but I don't want to re-indent all the file. At least, the following
patch fixes makes it better for the concerned function.

Cheers,
Willy


--- ./net/atm/mpoa_proc.c.orig	Sun Mar 28 15:04:17 2004
+++ ./net/atm/mpoa_proc.c	Sun Mar 28 15:06:25 2004
@@ -100,9 +100,9 @@
  */
 static ssize_t proc_mpc_read(struct file *file, char *buff,
 			     size_t count, loff_t *pos){
-        unsigned long page = 0;
+	unsigned long page = 0;
 	unsigned char *temp;
-        ssize_t length  = 0;
+	int length  = 0;
 	int i = 0;
 	struct mpoa_client *mpc = mpcs;
 	in_cache_entry *in_entry;

Re: [PATCH-2.4.26] ATM cleanup

[chas williams (contractor)]

please apply to the 2.4 and 2.6 kernels.

thanks!


# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1717  -> 1.1718 
#	 net/atm/mpoa_proc.c	1.7     -> 1.8    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/30	chas@relax.cmf.nrl.navy.mil	1.1718
# [ATM]: mpoa_proc warning cleanup (from Willy TARREAU <willy@w.ods.org>)
# --------------------------------------------
#
diff -Nru a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
--- a/net/atm/mpoa_proc.c	Tue Mar 30 12:41:47 2004
+++ b/net/atm/mpoa_proc.c	Tue Mar 30 12:41:47 2004
@@ -103,7 +103,7 @@
 			     size_t count, loff_t *pos){
         unsigned long page = 0;
 	unsigned char *temp;
-        ssize_t length  = 0;
+        int length = 0;
 	int i = 0;
 	struct mpoa_client *mpc = mpcs;
 	in_cache_entry *in_entry;

Re: [PATCH-2.4.26] ATM cleanup

[David S. Miller]

On Tue, 30 Mar 2004 12:44:30 -0500
"chas williams (contractor)" <chas@cmf.nrl.navy.mil> wrote:

> please apply to the 2.4 and 2.6 kernels.

Applied, thanks Chas.

[PATCH-2.4.26] AGPGART cleanup

[Willy TARREAU]

Hi Marcelo, Jeff,

drivers/char/agp/agpgart_be.c defines several agp_generic_*
functions for chipsets which do not need a specific one.
Unfortunately, a lot of chipsets don't use them all, so in
most cases, some of them are defined but not used. This makes
gcc print warnings and adds useless code. This afternoon, I
felt brave and added all the #ifdef needed depending on what
the chipsets use. I did it carefully, so I think I did not
miss any, but a second check might be useful. An interesting
side effect is that it reduced the driver by about 2 kB for a
VIA chipset.

Here is the patch against 2.4.26-rc1. I don't know if it's
too late for 2.4.26, but at least it could be reviewed.

Cheers,
Willy


--- ./drivers/char/agp/agpgart_be.c.orig	Sun Mar 28 11:48:47 2004
+++ ./drivers/char/agp/agpgart_be.c	Sun Mar 28 15:28:29 2004
@@ -398,6 +398,8 @@
 
 /* Generic Agp routines - Start */
 
+#if CONFIG_AGP_I460 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD || CONFIG_AGP_ALI || CONFIG_AGP_NVIDIA || CONFIG_AGP_ATI
 static void agp_generic_agp_enable(u32 mode)
 {
 	struct pci_dev *device = NULL;
@@ -490,7 +492,10 @@
 			pci_write_config_dword(device, cap_ptr + 8, command);
 	}
 }
+#endif /* CONFIG_AGP_* */
 
+#if CONFIG_AGP_I810 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD_K8 || CONFIG_AGP_ALI || CONFIG_AGP_NVIDIA
 static int agp_generic_create_gatt_table(void)
 {
 	char *table;
@@ -614,7 +619,11 @@
 
 	return 0;
 }
+#endif /* CONFIG_AGP_* */
 
+#if CONFIG_AGP_I810 || CONFIG_AGP_I460 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA \
+ || CONFIG_AGP_SIS || CONFIG_AGP_AMD || CONFIG_AGP_AMD_K8 || CONFIG_AGP_ALI \
+ || CONFIG_AGP_SWORKS || CONFIG_AGP_NVIDIA || CONFIG_AGP_ATI
 static int agp_generic_suspend(void)
 {
 	return 0;
@@ -624,7 +633,10 @@
 {
 	return;
 }
+#endif /* CONFIG_AGP_* */
 
+#if CONFIG_AGP_I810 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD_K8 || CONFIG_AGP_ALI || CONFIG_AGP_NVIDIA
 static int agp_generic_free_gatt_table(void)
 {
 	int page_order;
@@ -675,7 +687,9 @@
 	free_pages((unsigned long) agp_bridge.gatt_table_real, page_order);
 	return 0;
 }
+#endif /* CONFIG_AGP_* */
 
+#if CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS || CONFIG_AGP_ALI
 static int agp_generic_insert_memory(agp_memory * mem,
 				     off_t pg_start, int type)
 {
@@ -737,7 +751,11 @@
 	agp_bridge.tlb_flush(mem);
 	return 0;
 }
+#endif /* CONFIG_AGP_* */
 
+
+#if CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS || CONFIG_AMD_K8 \
+ || CONFIG_AGP_ALI
 static int agp_generic_remove_memory(agp_memory * mem, off_t pg_start,
 				     int type)
 {
@@ -755,7 +773,12 @@
 	agp_bridge.tlb_flush(mem);
 	return 0;
 }
+#endif /* CONFIG_AGP_* */
+
 
+#if CONFIG_AGP_I460 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD || CONFIG_AGP_AMD_K8 || CONFIG_AGP_ALI || CONFIG_AGP_SWORKS \
+ || CONFIG_AGP_NVIDIA || CONFIG_AGP_HP_ZX1 ||  CONFIG_AGP_ATI
 static agp_memory *agp_generic_alloc_by_type(size_t page_count, int type)
 {
 	return NULL;
@@ -769,6 +792,7 @@
 	agp_free_key(curr->key);
 	kfree(curr);
 }
+#endif /* CONFIG_AGP_* */
 
 /* 
  * Basic Page Allocation Routines -
@@ -779,6 +803,9 @@
  * against a maximum value.
  */
 
+#if CONFIG_AGP_I810 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD || CONFIG_AGP_AMD_K8 || CONFIG_AGP_ALI || CONFIG_AGP_SWORKS \
+ || CONFIG_AGP_NVIDIA || CONFIG_AGP_HP_ZX1 ||  CONFIG_AGP_ATI
 static unsigned long agp_generic_alloc_page(void)
 {
 	struct page * page;
@@ -798,7 +825,11 @@
 	atomic_inc(&agp_bridge.current_memory_agp);
 	return (unsigned long)page_address(page);
 }
+#endif /* CONFIG_AGP_* */
 
+#if CONFIG_AGP_I810 || CONFIG_AGP_INTEL || CONFIG_AGP_VIA || CONFIG_AGP_SIS \
+ || CONFIG_AGP_AMD || CONFIG_AGP_AMD_K8 || CONFIG_AGP_SWORKS \
+ || CONFIG_AGP_NVIDIA || CONFIG_AGP_HP_ZX1 ||  CONFIG_AGP_ATI
 static void agp_generic_destroy_page(unsigned long addr)
 {
 	void *pt = (void *) addr;
@@ -817,6 +848,7 @@
 	free_page((unsigned long) pt);
 	atomic_dec(&agp_bridge.current_memory_agp);
 }
+#endif /* CONFIG_AGP_* */
 
 /* End Basic Page Allocation Routines */
 

Re: Linux 2.4.26-rc1

[Arkadiusz Miskiewicz]

Dnia Sunday 28 of March 2004 06:26, Marcelo Tosatti napisał:
> Finally, -rc1.
>
> The first -rc contains an ACPI update, networking fixes, amongst others.
ACPI uses cmpxchg so it's not possible to build it for i386 it seems.

+__acpi_release_global_lock (unsigned int *lock)
+{
+       unsigned int old, new, val;
+       do {
+               old = *lock;
+               new = old & ~0x3;
+               val = cmpxchg(lock, old, new);
+       } while (unlikely (val != old));
+       return old & 0x1;
+}

/home/areq/rpm/BUILD/linux-2.4.25/arch/i386/lib/lib.a /home/areq/rpm/BUILD/linux-2.4.25/lib/lib.a /home/areq/rpm/BUILD/linux-2.4.25/arch/i386/lib/lib.a 
\
--end-group \
-o vmlinux
drivers/acpi/acpi.o(.text+0x4cf4): In function `acpi_ev_global_lock_handler':
: undefined reference to `cmpxchg'
drivers/acpi/acpi.o(.text+0x4dc6): In function `acpi_ev_acquire_global_lock':
: undefined reference to `cmpxchg'
drivers/acpi/acpi.o(.text+0x4e4b): In function `acpi_ev_release_global_lock':
: undefined reference to `cmpxchg'

-- 
Arkadiusz Miśkiewicz     CS at FoE, Wroclaw University of Technology
arekm.pld-linux.org, 1024/3DB19BBD, JID: arekm.jabber.org, PLD/Linux

Re: Linux 2.4.26-rc1

[Peter Osterlund]

Marcelo Tosatti <marcelo.tosatti@cyclades.com> writes:

> Sridhar Samudrala:
>   o [SCTP] Avoid the use of hacking CONFIG_IPV6_SCTP__ option
>
> Please test!

I get an error when selecting save and exit in "make xconfig":

  ERROR - Attempting to write value for unconfigured variable (CONFIG_IP_SCTP).

My .config looks like this:

$ cat .config | egrep -v '^#' | egrep '.'
CONFIG_X86=y
CONFIG_UID16=y
CONFIG_EXPERIMENTAL=y
CONFIG_MODULES=y
CONFIG_KMOD=y
CONFIG_MPENTIUM4=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_XADD=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_HAS_TSC=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_PGE=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_F00F_WORKS_OK=y
CONFIG_X86_MCE=y
CONFIG_X86_MSR=y
CONFIG_NOHIGHMEM=y
CONFIG_MTRR=y
CONFIG_X86_UP_APIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_TSC=y
CONFIG_NET=y
CONFIG_PCI=y
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_ISA=y
CONFIG_PCI_NAMES=y
CONFIG_HOTPLUG=y
CONFIG_PCMCIA=m
CONFIG_CARDBUS=y
CONFIG_SYSVIPC=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=m
CONFIG_PM=y
CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_BUS=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_PCI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SYSTEM=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_DEBUG=y
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_PC_CML1=m
CONFIG_PARPORT_PC_FIFO=y
CONFIG_PARPORT_1284=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_PACKET=y
CONFIG_NETFILTER=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_NF_CONNTRACK=y
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_MIRROR=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_SCTP_HMAC_NONE=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDE=y
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_BLK_DEV_IDESCSI=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_BLK_DEV_GENERIC=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_IDEDMA_PCI_AUTO=y
CONFIG_BLK_DEV_IDEDMA=y
CONFIG_BLK_DEV_PIIX=y
CONFIG_IDEDMA_AUTO=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=m
CONFIG_SD_EXTRA_DEVS=40
CONFIG_BLK_DEV_SR=y
CONFIG_SR_EXTRA_DEVS=2
CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_NET_ETHERNET=y
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_NET_PCI=y
CONFIG_TULIP=m
CONFIG_NATSEMI=m
CONFIG_8139TOO=m
CONFIG_PPP=m
CONFIG_PPP_ASYNC=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_PCNET=m
CONFIG_INPUT=m
CONFIG_INPUT_KEYBDEV=m
CONFIG_INPUT_MOUSEDEV=m
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1400
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1050
CONFIG_INPUT_EVDEV=m
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_SERIAL=m
CONFIG_SERIAL_EXTENDED=y
CONFIG_SERIAL_MANY_PORTS=y
CONFIG_SERIAL_SHARE_IRQ=y
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=1024
CONFIG_PRINTER=m
CONFIG_MOUSE=y
CONFIG_PSMOUSE=y
CONFIG_INTEL_RNG=m
CONFIG_RTC=m
CONFIG_AGP=m
CONFIG_AGP_INTEL=y
CONFIG_DRM=y
CONFIG_DRM_NEW=y
CONFIG_DRM_RADEON=m
CONFIG_PCMCIA_SERIAL_CS=m
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_PROC_FS=y
CONFIG_AUTOFS4_FS=m
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_PROC_INFO=y
CONFIG_EXT3_FS=y
CONFIG_JBD=y
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_RAMFS=y
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_PROC_FS=y
CONFIG_DEVPTS_FS=y
CONFIG_EXT2_FS=y
CONFIG_UDF_FS=m
CONFIG_UDF_RW=y
CONFIG_CODA_FS=m
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_SUNRPC=m
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp850"
CONFIG_ZISOFS_FS=m
CONFIG_PARTITION_ADVANCED=y
CONFIG_MSDOS_PARTITION=y
CONFIG_SMB_NLS=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_VGA_CONSOLE=y
CONFIG_VIDEO_SELECT=y
CONFIG_FB=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_VIDEO_SELECT=y
CONFIG_FB_RADEON=y
CONFIG_FBCON_CFB8=y
CONFIG_FBCON_CFB16=y
CONFIG_FBCON_CFB24=y
CONFIG_FBCON_CFB32=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_SOUND=m
CONFIG_SOUND_ICH=m
CONFIG_USB=m
CONFIG_USB_DEVICEFS=y
CONFIG_USB_UHCI=m
CONFIG_USB_AUDIO=m
CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_HID=m
CONFIG_USB_HIDINPUT=y
CONFIG_USB_PWC=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOG_BUF_SHIFT=0
CONFIG_CRYPTO=y
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m

-- 
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340

Re: Linux 2.4.26-rc1

[Frédéric L. W. Meunier]

On Sun, 28 Mar 2004, Peter Osterlund wrote:

> Marcelo Tosatti writes:
>
> > Sridhar Samudrala:
> >   o [SCTP] Avoid the use of hacking CONFIG_IPV6_SCTP__ option
> >
> > Please test!
>
> I get an error when selecting save and exit in "make xconfig":
>
>   ERROR - Attempting to write value for unconfigured variable (CONFIG_IP_SCTP).

Here oldconfig returned:

-CONFIG_IPV6_SCTP__=y
 # CONFIG_IP_SCTP is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set

But I also get the above loading my .config and saving with
xconfig.

I also noticed that xconfig cleaned it a bit, what oldconfig
and menuconfig don't do:

--- .config.old	2004-03-28 17:37:19.000000000 -0300
+++ .config	2004-03-28 17:37:19.000000000 -0300
@@ -99,10 +99,6 @@
 # PCI Hotplug Support
 #
 # CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
@@ -159,7 +155,6 @@
 # CONFIG_PARPORT_SERIAL is not set
 CONFIG_PARPORT_PC_FIFO=y
 # CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
 # CONFIG_PARPORT_AMIGA is not set
 # CONFIG_PARPORT_MFC3 is not set
 # CONFIG_PARPORT_ATARI is not set
@@ -173,7 +168,6 @@
 # Plug and Play configuration
 #
 # CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set

 #
 # Block devices
@@ -183,8 +177,6 @@
 # CONFIG_PARIDE is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_CISS_MONITOR_THREAD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_CDROM_PKTCDVD=m
@@ -192,20 +184,12 @@
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BLK_STATS=y

 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_BLK_DEV_LVM is not set

 #
 # Networking options
@@ -277,7 +261,11 @@
 #
 #    SCTP Configuration (EXPERIMENTAL)
 #
-# CONFIG_IP_SCTP is not set
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set

@@ -290,7 +278,6 @@
 #
 # Appletalk devices
 #
-# CONFIG_DEV_APPLETALK is not set
 # CONFIG_DECNET is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_X25 is not set
@@ -316,8 +303,6 @@
 # Telephony Support
 #
 # CONFIG_PHONE is not set
-# CONFIG_PHONE_IXJ is not set
-# CONFIG_PHONE_IXJ_PCMCIA is not set

 #
 # ATA/IDE/MFM/RLL support
@@ -337,7 +322,6 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDISK_STROKE is not set
-# CONFIG_BLK_DEV_IDECS is not set
 CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -348,8 +332,6 @@
 # IDE chipset support/bugfixes
 #
 # CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-# CONFIG_BLK_DEV_ISAPNP is not set
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_GENERIC is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
@@ -363,21 +345,17 @@
 # CONFIG_BLK_DEV_ADMA100 is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_WDC_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_HPT34X_AUTODMA is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_PDC202XX_BURST is not set
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
 # CONFIG_BLK_DEV_SC1200 is not set
@@ -392,10 +370,6 @@
 CONFIG_IDEDMA_IVB=y
 # CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_ATARAID is not set
-# CONFIG_BLK_DEV_ATARAID_PDC is not set
-# CONFIG_BLK_DEV_ATARAID_HPT is not set
-# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
-# CONFIG_BLK_DEV_ATARAID_SII is not set

 #
 # SCSI support
@@ -496,11 +470,6 @@
 # I2O device support
 #
 # CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set

 #
 # Network device support
@@ -521,10 +490,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_SUNLANCE is not set
 # CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
 # CONFIG_SUNGEM is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_EL1 is not set
@@ -533,8 +499,6 @@
 # CONFIG_EL16 is not set
 # CONFIG_EL3 is not set
 # CONFIG_3C515 is not set
-# CONFIG_ELMC is not set
-# CONFIG_ELMC_II is not set
 CONFIG_VORTEX=m
 # CONFIG_TYPHOON is not set
 # CONFIG_LANCE is not set
@@ -557,15 +521,11 @@
 # CONFIG_DGRS is not set
 # CONFIG_DM9102 is not set
 # CONFIG_EEPRO100 is not set
-# CONFIG_EEPRO100_PIO is not set
 # CONFIG_E100 is not set
-# CONFIG_LNE390 is not set
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_FORCEDETH is not set
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
@@ -575,10 +535,8 @@
 # CONFIG_SIS900 is not set
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
-# CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_NET_POCKET is not set

@@ -588,7 +546,6 @@
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
-# CONFIG_MYRI_SBUS is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -698,7 +655,8 @@
 # CONFIG_I2C_PHILIPSPAR is not set
 # CONFIG_I2C_ELV is not set
 # CONFIG_I2C_VELLEMAN is not set
-# CONFIG_SCx200_I2C is not set
+CONFIG_SCx200_I2C_SCL=12
+CONFIG_SCx200_I2C_SDA=13
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_ALGOPCF is not set
 CONFIG_I2C_MAINBOARD=y
@@ -785,7 +743,6 @@
 # CONFIG_INPUT_CS461X is not set
 # CONFIG_INPUT_EMU10K1 is not set
 # CONFIG_INPUT_SERIO is not set
-# CONFIG_INPUT_SERPORT is not set

 #
 # Joysticks
@@ -800,28 +757,17 @@
 # CONFIG_INPUT_TMDC is not set
 # CONFIG_INPUT_SIDEWINDER is not set
 # CONFIG_INPUT_IFORCE_USB is not set
-# CONFIG_INPUT_IFORCE_232 is not set
-# CONFIG_INPUT_WARRIOR is not set
-# CONFIG_INPUT_MAGELLAN is not set
-# CONFIG_INPUT_SPACEORB is not set
-# CONFIG_INPUT_SPACEBALL is not set
-# CONFIG_INPUT_STINGER is not set
 # CONFIG_INPUT_DB9 is not set
 # CONFIG_INPUT_GAMECON is not set
 # CONFIG_INPUT_TURBOGRAFX is not set
 # CONFIG_QIC02_TAPE is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_DEVICE_INTERFACE is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_IPMI_WATCHDOG is not set

 #
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
 # CONFIG_SCx200 is not set
-# CONFIG_SCx200_GPIO is not set
 # CONFIG_AMD_RNG is not set
 # CONFIG_INTEL_RNG is not set
 # CONFIG_HW_RANDOM is not set
@@ -864,7 +810,6 @@
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I810_XFREE_41 is not set
 # CONFIG_DRM_I830 is not set
 CONFIG_DRM_MGA=m
 # CONFIG_DRM_SIS is not set
@@ -895,11 +840,7 @@
 # CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ZORAN_BUZ is not set
-# CONFIG_VIDEO_ZORAN_DC10 is not set
-# CONFIG_VIDEO_ZORAN_LML33 is not set
 # CONFIG_VIDEO_ZR36120 is not set
-# CONFIG_VIDEO_MEYE is not set

 #
 # Radio Adapters
@@ -912,8 +853,6 @@
 # CONFIG_RADIO_GEMTEK_PCI is not set
 # CONFIG_RADIO_MAXIRADIO is not set
 # CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MIROPCM20 is not set
-# CONFIG_RADIO_MIROPCM20_RDS is not set
 # CONFIG_RADIO_SF16FMI is not set
 # CONFIG_RADIO_SF16FMR2 is not set
 # CONFIG_RADIO_TERRATEC is not set
@@ -925,30 +864,22 @@
 # File systems
 #
 # CONFIG_QUOTA is not set
-# CONFIG_QFMT_V2 is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 CONFIG_EXT3_FS=y
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FAT_FS=y
 # CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
 CONFIG_VFAT_FS=m
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_TMPFS=y
 CONFIG_RAMFS=y
@@ -956,8 +887,6 @@
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 # CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
 CONFIG_MINIX_FS=m
 # CONFIG_VXFS_FS is not set
 CONFIG_NTFS_FS=m
@@ -970,7 +899,6 @@
 # CONFIG_DEVFS_DEBUG is not set
 # CONFIG_DEVPTS_FS is not set
 # CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_EXT2_FS=m
 # CONFIG_SYSV_FS is not set
@@ -979,10 +907,6 @@
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_TRACE is not set
-# CONFIG_XFS_DEBUG is not set

 #
 # Network File Systems
@@ -990,24 +914,11 @@
 # CONFIG_CODA_FS is not set
 # CONFIG_INTERMEZZO_FS is not set
 # CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_ROOT_NFS is not set
 # CONFIG_NFSD is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
 # CONFIG_SUNRPC is not set
 # CONFIG_LOCKD is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
 CONFIG_ZISOFS_FS=m

 #
@@ -1102,7 +1013,6 @@
 CONFIG_FB_MATROX_G100A=y
 CONFIG_FB_MATROX_G100=y
 # CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_MATROX_MAVEN is not set
 CONFIG_FB_MATROX_PROC=m
 # CONFIG_FB_MATROX_MULTIHEAD is not set
 # CONFIG_FB_ATY is not set
@@ -1161,7 +1071,6 @@
 CONFIG_SOUND_CMPCI_SPDIFLOOP=y
 CONFIG_SOUND_CMPCI_SPEAKERS=2
 # CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_MIDI_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_CS4281 is not set
 # CONFIG_SOUND_ES1370 is not set
@@ -1209,19 +1118,9 @@
 # USB Device Class drivers
 #
 # CONFIG_USB_AUDIO is not set
-# CONFIG_USB_EMI26 is not set
 # CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_MIDI is not set
 # CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m

-- 
http://www.pervalidus.net/contact.html

Re: Linux 2.4.26-rc1 - SCTP 'make xconfig' issue

[Sridhar Samudrala]

On Sun, 28 Mar 2004, Peter Osterlund wrote:

> Marcelo Tosatti <marcelo.tosatti@cyclades.com> writes:
>
> > Sridhar Samudrala:
> >   o [SCTP] Avoid the use of hacking CONFIG_IPV6_SCTP__ option
> >
> > Please test!
>
> I get an error when selecting save and exit in "make xconfig":
>
>   ERROR - Attempting to write value for unconfigured variable (CONFIG_IP_SCTP)

Vladislav Yasevich did some investigation into this issue and he came
out with the conclusion that this is due to a bug in the parser for
'make xconfig'(tkparse). 'make menuconfig' and 'make oldconfig' should work
fine.

The parser for 'make xconfig' (tkparse)  does not handle correctly
conditionals that redefine the same variable to be of two
different types.  This is particularly pronounce when one
is a dependancy variable and the other is not.  For each
[dep_]tristate definition, the parser generates lines in
the tk script that set the variable.  Whe TK interprets it,
the end result is that the variable is set incorrectly.  I was
able to modify the TK script by hand to fix this, but the
problem seems to realy be in the tkparse parser.

He came up with the following patch that works around this issue with
tkparse.  Could you please verify if this works for you?

diff -Nru a/net/sctp/Config.in b/net/sctp/Config.in
--- a/net/sctp/Config.in	Wed Mar 31 14:22:45 2004
+++ b/net/sctp/Config.in	Wed Mar 31 14:22:45 2004
@@ -4,10 +4,10 @@
 mainmenu_option next_comment
 comment '   SCTP Configuration (EXPERIMENTAL)'

-if [ "$CONFIG_IPV6" = "n" ]; then
-  tristate '  The SCTP Protocol (EXPERIMENTAL)' CONFIG_IP_SCTP
-else
-  dep_tristate '  The SCTP Protocol (EXPERIMENTAL)' CONFIG_IP_SCTP $CONFIG_IPV6
+tristate '  The SCTP Protocol (EXPERIMENTAL)' CONFIG_IP_SCTP
+
+if [ "$CONFIG_IP_SCTP" = "y" -a "$CONFIG_IPV6" = "m" ]; then
+	define_tristate CONFIG_IP_SCTP m
 fi

 if [ "$CONFIG_IP_SCTP" != "n" ]; then

Thanks
Sridhar

Re: Linux 2.4.26-rc1 - SCTP 'make xconfig' issue

[Peter Osterlund]

Sridhar Samudrala <sri@us.ibm.com> writes:

> On Sun, 28 Mar 2004, Peter Osterlund wrote:
> 
> > Marcelo Tosatti <marcelo.tosatti@cyclades.com> writes:
> >
> > > Sridhar Samudrala:
> > >   o [SCTP] Avoid the use of hacking CONFIG_IPV6_SCTP__ option
> > >
> > > Please test!
> >
> > I get an error when selecting save and exit in "make xconfig":
> >
> >   ERROR - Attempting to write value for unconfigured variable (CONFIG_IP_SCTP)
> 
> Vladislav Yasevich did some investigation into this issue and he came
> out with the conclusion that this is due to a bug in the parser for
> 'make xconfig'(tkparse). 'make menuconfig' and 'make oldconfig' should work
> fine.
...
> He came up with the following patch that works around this issue with
> tkparse.  Could you please verify if this works for you?

It works fine for me. Thanks.

-- 
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340

Re: Linux 2.4.26-rc1 - SCTP 'make xconfig' issue

[David S. Miller]

On Wed, 31 Mar 2004 16:47:04 -0800 (PST)
Sridhar Samudrala <sri@us.ibm.com> wrote:

> He came up with the following patch that works around this issue with
> tkparse.  Could you please verify if this works for you?

It seems to fix the problem, should I apply this Sridhar?

Re: Linux 2.4.26-rc1 - SCTP 'make xconfig' issue

[Sridhar Samudrala]

On Wed, 31 Mar 2004, David S. Miller wrote:

> On Wed, 31 Mar 2004 16:47:04 -0800 (PST)
> Sridhar Samudrala <sri@us.ibm.com> wrote:
>
> > He came up with the following patch that works around this issue with
> > tkparse.  Could you please verify if this works for you?
>
> It seems to fix the problem, should I apply this Sridhar?

Sure. As Peter also has validated, it can be applied.

Thanks
Sridhar