Skip to contentSkip to conversation

s390: minor claw driver fix

PATCH In review Frank Pavlic 2 participants 3 messages Mar 22, 2006

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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 .

diffstat:

 claw.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/s390/net/claw.c +3 -3
index a86436a..4687bb5 100644
@@ -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);
#1 lore raw
Quoted 5 lines · Frank Pavlic

[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

#2 lore raw
Quoted 5 lines · On Wed, 22 Mar 2006 16:42:14 +0100 "Martin Schwidefsky"…
Quoted 4 lines · Frank Pavlic

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

From: Frank Pavlic <[email protected]>

Quoted 8 lines
Quoted 1 line

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