2 files changed, 9 insertions, 6 deletions

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 5cb93a8e3403..11f3b071f305 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -562,6 +562,9 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
                 skb_queue_tail(&ch->io_queue, skb);
                 ccw_idx = 3;
         }
+        if (do_debug_ccw)
+                ctcmpc_dumpit((char *)&ch->ccw[ccw_idx],
+                                        sizeof(struct ccw1) * 3);
         ch->retry = 0;
         fsm_newstate(ch->fsm, CTC_STATE_TX);
         fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch);
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index da4c747335e7..ac7975b7a837 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -53,8 +53,8 @@
 #include <linux/moduleparam.h>
 #include <asm/idals.h>
 
-#include "ctcm_mpc.h"
 #include "ctcm_main.h"
+#include "ctcm_mpc.h"
 #include "ctcm_fsms.h"
 
 static const struct xid2 init_xid = {
@@ -132,7 +132,7 @@ void ctcmpc_dumpit(char *buf, int len)
         __u32   ct, sw, rm, dup;
         char    *ptr, *rptr;
         char    tbuf[82], tdup[82];
-        #if (UTS_MACHINE == s390x)
+        #ifdef CONFIG_64BIT
         char    addr[22];
         #else
         char    addr[12];
@@ -149,8 +149,8 @@ void ctcmpc_dumpit(char *buf, int len)
 
         for (ct = 0; ct < len; ct++, ptr++, rptr++) {
                 if (sw == 0) {
-                        #if (UTS_MACHINE == s390x)
-                        sprintf(addr, "%16.16lx", (__u64)rptr);
+                        #ifdef CONFIG_64BIT
+                        sprintf(addr, "%16.16llx", (__u64)rptr);
                         #else
                         sprintf(addr, "%8.8X", (__u32)rptr);
                         #endif
@@ -164,8 +164,8 @@ void ctcmpc_dumpit(char *buf, int len)
                 if (sw == 8)
                         strcat(bhex, "  ");
 
-                #if (UTS_MACHINE == s390x)
-                sprintf(tbuf, "%2.2lX", (__u64)*ptr);
+                #if CONFIG_64BIT
+                sprintf(tbuf, "%2.2llX", (__u64)*ptr);
                 #else
                 sprintf(tbuf, "%2.2X", (__u32)*ptr);
                 #endif