From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Jul 2017 02:38:43 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.14-rc1~130^2~465
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a68ada6ec7d88c68057d3a4c2a517eb94289976;p=platform%2Fkernel%2Flinux-exynos.git

Merge git://git./linux/kernel/git/davem/net
---

7a68ada6ec7d88c68057d3a4c2a517eb94289976
diff --cc net/sctp/sm_make_chunk.c
index 06dc351b6ba1,6110447fe51d..0b36e96cb0df
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@@ -223,12 -223,12 +223,12 @@@ struct sctp_chunk *sctp_make_init(cons
  	struct sctp_chunk *retval = NULL;
  	int num_types, addrs_len = 0;
  	struct sctp_sock *sp;
 -	sctp_supported_addrs_param_t sat;
 +	struct sctp_supported_addrs_param sat;
  	__be16 types[2];
 -	sctp_adaptation_ind_param_t aiparam;
 -	sctp_supported_ext_param_t ext_param;
 +	struct sctp_adaptation_ind_param aiparam;
 +	struct sctp_supported_ext_param ext_param;
  	int num_ext = 0;
- 	__u8 extensions[3];
+ 	__u8 extensions[4];
  	struct sctp_paramhdr *auth_chunks = NULL,
  			*auth_hmacs = NULL;
  
@@@ -390,10 -393,10 +390,10 @@@ struct sctp_chunk *sctp_make_init_ack(c
  	sctp_cookie_param_t *cookie;
  	int cookie_len;
  	size_t chunksize;
 -	sctp_adaptation_ind_param_t aiparam;
 -	sctp_supported_ext_param_t ext_param;
 +	struct sctp_adaptation_ind_param aiparam;
 +	struct sctp_supported_ext_param ext_param;
  	int num_ext = 0;
- 	__u8 extensions[3];
+ 	__u8 extensions[4];
  	struct sctp_paramhdr *auth_chunks = NULL,
  			*auth_hmacs = NULL,
  			*auth_random = NULL;