Commit ce1f8938 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

ctcm: make ctcmpc debugging compilable 



ctcmpc debugging can be activated defining constant DEBUGCCW.
The debugging part contains wrong checks for 64 bit addresses.
Thus the debugging version does not compile.
This patch corrects the 64-bit address checks to make it
compilable.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Reviewed-by: default avatarBelinda Thompson <belindat@us.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2022e00c

drivers/s390/net/ctcm_main.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/s390/net/ctcm_mpc.c

+6 −6
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE