2006-03-22 15:27:06

by Frank Pavlic

Subject: [patch 1/6] s390: minor claw driver fix

Hi ,
following 6 patches are for s390 network drivers claw, qeth and ctc.
tty support will be removed from the ctc network device driver , which will
happen with patch 5/6 and 6/6 . The latter one will remove two files , ctctty.c and ctctty.h .

Thanks

Frank

[patch 1/6] s390: minor claw driver fix

From: Frank Pavlic <[email protected]>

use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .

Signed-off-by: Frank Pavlic <[email protected]>

diffstat:
claw.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index a86436a..4687bb5 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -1601,7 +1601,7 @@ dumpit(char* buf, int len)
__u32 ct, sw, rm, dup;
char *ptr, *rptr;
char tbuf[82], tdup[82];
-#if (CONFIG_64BIT)
+#if (CONFIG_ARCH_S390X)
char addr[22];
#else
char addr[12];
@@ -1617,7 +1617,7 @@ dumpit(char* buf, int len)
dup = 0;
for ( ct=0; ct < len; ct++, ptr++, rptr++ ) {
if (sw == 0) {
-#if (CONFIG_64BIT)
+#if (CONFIG_ARCH_S390X)
sprintf(addr, "%16.16lX",(unsigned long)rptr);
#else
sprintf(addr, "%8.8X",(__u32)rptr);
@@ -1632,7 +1632,7 @@ dumpit(char* buf, int len)
if (sw == 8) {
strcat(bhex, " ");
}
-#if (CONFIG_64BIT)
+#if (CONFIG_ARCH_S390X)
sprintf(tbuf,"%2.2lX", (unsigned long)*ptr);
#else
sprintf(tbuf,"%2.2X", (__u32)*ptr);

2006-03-22 15:42:16

by Martin Schwidefsky

Subject: Re: [patch 1/6] s390: minor claw driver fix

On 3/22/06, Frank Pavlic <[email protected]> wrote:
> [patch 1/6] s390: minor claw driver fix
>
> From: Frank Pavlic <[email protected]>
>
> use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .

Nack. CONFIG_ARCH_S390X doesn't exists anymore. It has been replaced
by CONFIG_64BIT in 2.6.16.

--
blue skies,
Martin

2006-03-22 18:00:27

by Frank Pavlic

Subject: Re: [patch 1/6] s390: minor claw driver fix

On Wed, 22 Mar 2006 16:42:14 +0100
"Martin Schwidefsky" <[email protected]> wrote:

> On 3/22/06, Frank Pavlic <[email protected]> wrote:
> > [patch 1/6] s390: minor claw driver fix
> >
> > From: Frank Pavlic <[email protected]>
> >
> > use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .
>
> Nack. CONFIG_ARCH_S390X doesn't exists anymore. It has been replaced
> by CONFIG_64BIT in 2.6.16.
>
> --
> blue skies,
> Martin

oh boy , you are absolutely right , did take the wrong kernel level for making this patch .
it was just before you did the upgrade to 2.6.16 :-(..

Jeff please don't apply this one ...the rest [2/6] - [6/6] is ok ...

Frank