svn commit: r254670 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu Aug 22 19:28:13 2013
New Revision: 254670
URL: http://svnweb.freebsd.org/changeset/base/254670

Log:
  Make also the features of the association 64-bit.
  When exporting to xinpcb, just export the lower
  32-bit. Using there also 64-bits will break the
  ABI and will be committed separetly.
  
  MFC after: 2 weeks
  X-MFC with: 254248

Modified:
  head/sys/netinet/sctp_structs.h
  head/sys/netinet/sctp_sysctl.c

Modified: head/sys/netinet/sctp_structs.h
==============================================================================
--- head/sys/netinet/sctp_structs.h	Thu Aug 22 18:41:28 2013	(r254669)
+++ head/sys/netinet/sctp_structs.h	Thu Aug 22 19:28:13 2013	(r254670)
@@ -1205,7 +1205,7 @@ struct sctp_association {
 	/* JRS 5/21/07 - CMT PF variable */
 	uint8_t sctp_cmt_pf;
 	uint8_t use_precise_time;
-	uint32_t sctp_features;
+	uint64_t sctp_features;
 	uint16_t port;		/* remote UDP encapsulation port */
 	/*
 	 * The mapping array is used to track out of order sequences above

Modified: head/sys/netinet/sctp_sysctl.c
==============================================================================
--- head/sys/netinet/sctp_sysctl.c	Thu Aug 22 18:41:28 2013	(r254669)
+++ head/sys/netinet/sctp_sysctl.c	Thu Aug 22 19:28:13 2013	(r254670)
@@ -402,7 +402,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 		xinpcb.last = 0;
 		xinpcb.local_port = ntohs(inp->sctp_lport);
 		xinpcb.flags = inp->sctp_flags;
-		xinpcb.features = inp->sctp_features;
+		xinpcb.features = (uint32_t) inp->sctp_features;
 		xinpcb.total_sends = inp->total_sends;
 		xinpcb.total_recvs = inp->total_recvs;
 		xinpcb.total_nospaces = inp->total_nospaces;