[PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2'

[PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2'

[Jesper Juhl]

To silence the warning in $subject, rename log2 to cycx_log2 in this file 
to remove the clash, so there's no doubt that this file uses it's own
defined log2 function.

Patch against 2.6.8-rc2-mm1

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>


diff -up linux-2.6.8-rc2-mm1-orig/drivers/net/wan/cycx_x25.c linux-2.6.8-rc2-mm1/drivers/net/wan/cycx_x25.c
--- linux-2.6.8-rc2-mm1-orig/drivers/net/wan/cycx_x25.c	2004-06-16 07:19:01.000000000 +0200
+++ linux-2.6.8-rc2-mm1/drivers/net/wan/cycx_x25.c	2004-07-31 22:10:02.000000000 +0200
@@ -186,7 +186,7 @@ static void nibble_to_byte(u8 *s, u8 *d,
  	    reset_timer(struct net_device *dev);

  static u8 bps_to_speed_code(u32 bps);
-static u8 log2(u32 n);
+static u8 cycx_log2(u32 n);

  static unsigned dec_to_uint(u8 *str, int len);

@@ -263,7 +263,7 @@ int cycx_x25_wan_init(struct cycx_device
  	else
  		card->wandev.mtu = 64;

-	cfg.pktlen = log2(card->wandev.mtu);
+	cfg.pktlen = cycx_log2(card->wandev.mtu);

  	if (conf->station == WANOPT_DTE) {
  		cfg.locaddr = 3; /* DTE */
@@ -1513,7 +1513,7 @@ static u8 bps_to_speed_code(u32 bps)
  }

  /* log base 2 */
-static u8 log2(u32 n)
+static u8 cycx_log2(u32 n)
  {
  	u8 log = 0;

Re: [PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2'

[Andrew Morton]

Jesper Juhl <juhl-lkml@dif.dk> wrote:
>

Your patches get random rejects.

> Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

Probably because of the format=flowed braindamage.

I fixed this one up.

Re: [PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2'

[Jesper Juhl]

On Sat, 31 Jul 2004, Andrew Morton wrote:

> Jesper Juhl <juhl-lkml@dif.dk> wrote:
>>
>
> Your patches get random rejects.
>
>> Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
>
> Probably because of the format=flowed braindamage.
>
Ouch, sorry about that, I recently upgraded my pine version to 4.60 and 
was unaware that from that version and forward pine generates flowed text 
by default. I'll get that fixed up at once.


> I fixed this one up.
>
Thank you.  


--
Jesper Juhl <juhl-lkml@dif.dk>

Re: [PATCH] drivers/net/wan/cycx_x25.c:189: warning: conflicting types for built-in function 'log2'

[Arnaldo Carvalho de Melo]

Em Sun, Aug 01, 2004 at 02:53:06AM +0200, Jesper Juhl escreveu:
> On Sat, 31 Jul 2004, Andrew Morton wrote:
> 
> > Jesper Juhl <juhl-lkml@dif.dk> wrote:
> >>
> >
> > Your patches get random rejects.
> >
> >> Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
> >
> > Probably because of the format=flowed braindamage.
> >
> Ouch, sorry about that, I recently upgraded my pine version to 4.60 and 
> was unaware that from that version and forward pine generates flowed text 
> by default. I'll get that fixed up at once.
> 
> 
> > I fixed this one up.
> >
> Thank you.  

Thanks for the patch