Re: Linux v2.5.48

[Randy.Dunlap]

On Wed, 27 Nov 2002, Adrian Bunk wrote:

| On Sun, Nov 17, 2002 at 08:41:05PM -0800, Linus Torvalds wrote:
|
| >...
| > Summary of changes from v2.5.47 to v2.5.48
| > ============================================
| >...
| > Alexey Kuznetsov <[e-mail]>:
| >   o [IPSEC]: More fixes and corrections
| >...
|
| The following part of this patch looks bogus:
|
| <--  snip  -->
|
| --- 1.6/net/key/af_key.c        Fri Nov  8 00:34:37 2002
| +++ 1.7/net/key/af_key.c        Mon Nov 11 01:03:55 2002
| ...
| @@ -2179,7 +2223,7 @@
|         if (skb)
|                 kfree_skb(skb);
|
| -       return err;
| +       return err ? : len;
|  }
|
|  static int pfkey_recvmsg(struct kiocb *kiocb,
|
| <--  snip  -->
|
|
| Is the following correct to fix it?
|
|
| --- linux/net/key/af_key.c.old	2002-11-27 00:12:28.000000000 +0100
| +++ linux/net/key/af_key.c	2002-11-27 00:12:40.000000000 +0100
| @@ -2242,7 +2242,7 @@
|  	if (skb)
|  		kfree_skb(skb);
|
| -	return err ? : len;
| +	return err ? err : len;
|  }
|
|  static int pfkey_recvmsg(struct kiocb *kiocb,

Hi Adrian,

That's a gcc extension that means the same as your patch.  See
http://gcc.gnu.org/onlinedocs/gcc-3.2/gcc/Conditionals.html#Conditionals

It would be OK with me not to accept such extensions.  :)

-- 
~Randy