* [patch 1/6] s390: minor claw driver fix
@ 2006-03-22 15:03 Frank Pavlic
2006-03-22 16:28 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Frank Pavlic @ 2006-03-22 15:03 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, linux-kernel
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 <fpavlic@de.ibm.com>
use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
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);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [patch 1/6] s390: minor claw driver fix
@ 2006-03-22 15:28 Frank Pavlic
2006-03-22 15:42 ` Martin Schwidefsky
0 siblings, 1 reply; 6+ messages in thread
From: Frank Pavlic @ 2006-03-22 15:28 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, linux-kernel
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 <fpavlic@de.ibm.com>
use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
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);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch 1/6] s390: minor claw driver fix
2006-03-22 15:28 Frank Pavlic
@ 2006-03-22 15:42 ` Martin Schwidefsky
2006-03-22 18:01 ` Frank Pavlic
0 siblings, 1 reply; 6+ messages in thread
From: Martin Schwidefsky @ 2006-03-22 15:42 UTC (permalink / raw)
To: Frank Pavlic; +Cc: Jeff Garzik, netdev, linux-kernel
On 3/22/06, Frank Pavlic <fpavlic@de.ibm.com> wrote:
> [patch 1/6] s390: minor claw driver fix
>
> From: Frank Pavlic <fpavlic@de.ibm.com>
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 1/6] s390: minor claw driver fix
2006-03-22 15:03 [patch 1/6] s390: minor claw driver fix Frank Pavlic
@ 2006-03-22 16:28 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2006-03-22 16:28 UTC (permalink / raw)
To: Frank Pavlic; +Cc: Jeff Garzik, netdev, linux-kernel
On Wed, Mar 22, 2006 at 04:03:36PM +0100, Frank Pavlic wrote:
> Hi ,
> following 6 patches are for s390 network drivers claw, qeth and ctc.
> tty support will be removed from the ctc network device driver
Why?
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch 1/6] s390: minor claw driver fix
@ 2006-03-22 16:42 Frank Pavlic
0 siblings, 0 replies; 6+ messages in thread
From: Frank Pavlic @ 2006-03-22 16:42 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, linux-kernel
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 <fpavlic@de.ibm.com>
use CONFIG_ARCH_S390X instead of CONFIG_64BIT in function dumpit .
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
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);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch 1/6] s390: minor claw driver fix
2006-03-22 15:42 ` Martin Schwidefsky
@ 2006-03-22 18:01 ` Frank Pavlic
0 siblings, 0 replies; 6+ messages in thread
From: Frank Pavlic @ 2006-03-22 18:01 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Martin Schwidefsky, netdev, linux-kernel
On Wed, 22 Mar 2006 16:42:14 +0100
"Martin Schwidefsky" <schwidefsky@googlemail.com> wrote:
> On 3/22/06, Frank Pavlic <fpavlic@de.ibm.com> wrote:
> > [patch 1/6] s390: minor claw driver fix
> >
> > From: Frank Pavlic <fpavlic@de.ibm.com>
> >
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-03-22 18:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-03-22 15:03 [patch 1/6] s390: minor claw driver fix Frank Pavlic
2006-03-22 16:28 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2006-03-22 15:28 Frank Pavlic
2006-03-22 15:42 ` Martin Schwidefsky
2006-03-22 18:01 ` Frank Pavlic
2006-03-22 16:42 Frank Pavlic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).