From 9fe01d5c9e750d0622b816574fb14f9c0f043cac Mon Sep 17 00:00:00 2001
From: rrs <rrs@FreeBSD.org>
Date: Fri, 3 Nov 2006 23:04:34 +0000
Subject: [PATCH] More 64 bit pointer fun. %p changed in multiple prints the
 mtod() was also fixed.

---
 sys/netinet/sctp_input.c  | 2 +-
 sys/netinet/sctp_pcb.c    | 2 +-
 sys/netinet/sctp_timer.c  | 4 ++--
 sys/netinet/sctp_usrreq.c | 2 +-
 sys/netinet/sctputil.c    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index e417f2964d96..01c9ef7a6381 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -250,7 +250,7 @@ sctp_process_init(struct sctp_init_chunk *cp, struct sctp_tcb *stcb,
 					sctp_free_remote_addr(sp->net);
 					sp->net = NULL;
 					/* Free the chunk */
-					printf("sp:%x tcb:%x weird free case\n",
+					printf("sp:%p tcb:%p weird free case\n",
 					    (u_int)sp, (u_int)stcb);
 
 					sctp_free_a_strmoq(stcb, sp);
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 977dfe7b9dea..1a7e0ac1273a 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -2206,7 +2206,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
 					sp = TAILQ_LAST(&((asoc->asoc.locked_on_sending)->outqueue),
 					    sctp_streamhead);
 					if (sp == NULL) {
-						printf("Error, sp is NULL, locked on sending is %x strm:%d\n",
+						printf("Error, sp is NULL, locked on sending is %ps strm:%d\n",
 						    (u_int)asoc->asoc.locked_on_sending,
 						    asoc->asoc.locked_on_sending->stream_no);
 					} else {
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index af59fa4cf388..9566aef7bc60 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -862,7 +862,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
 	int win_probe, num_mk;
 
 #ifdef SCTP_FR_LOGGING
-	sctp_log_fr(sctps_datadropchklmt.sctps_senddata, 0, 0, SCTP_FR_T3_TIMEOUT);
+	sctp_log_fr(0, 0, 0, SCTP_FR_T3_TIMEOUT);
 #ifdef SCTP_CWND_LOGGING
 	{
 		struct sctp_nets *lnet;
@@ -1662,7 +1662,7 @@ select_a_new_ep:
 	}
 	if ((it->inp->inp_starting_point_for_iterator != NULL) &&
 	    (it->inp->inp_starting_point_for_iterator != it)) {
-		printf("Iterator collision, waiting for one at 0x%x\n",
+		printf("Iterator collision, waiting for one at %p\n",
 		    (uint32_t) it->inp);
 		SCTP_INP_WUNLOCK(it->inp);
 		goto start_timer_return;
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 3ba8179d1c00..63097a84e90e 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -3131,7 +3131,7 @@ sctp_optsset(struct socket *so,
 				error = EINVAL;
 				break;
 			}
-			on_off = (mtod(m, int));
+			on_off = *(mtod(m, int *));
 			if (on_off) {
 				sctp_feature_on(inp, SCTP_PCB_FLAGS_FRAG_INTERLEAVE);
 			} else {
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index e8fb2d5be03a..bcd7c4553213 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -3271,12 +3271,12 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb,
 		break;
 	case SCTP_NOTIFY_AUTH_NEW_KEY:
 		sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error,
-		    (uint32_t) data);
+		    (uint16_t) (uintptr_t) data);
 		break;
 #if 0
 	case SCTP_NOTIFY_AUTH_KEY_CONFLICT:
 		sctp_notify_authentication(stcb, SCTP_AUTH_KEY_CONFLICT,
-		    error, (uint32_t) data);
+		    error, (uint16_t) (uintptr_t) data);
 		break;
 #endif				/* not yet? remove? */