From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757422Ab1ELTTj (ORCPT ); Thu, 12 May 2011 15:19:39 -0400 Received: from mail.perches.com ([173.55.12.10]:1567 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932122Ab1ELTTN (ORCPT ); Thu, 12 May 2011 15:19:13 -0400 From: Joe Perches To: Vlad Yasevich , Sridhar Samudrala Cc: "David S. Miller" , linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] sctp: sctp_sendmsg: Don't initialize default_sinfo Date: Thu, 12 May 2011 12:19:09 -0700 Message-Id: X-Mailer: git-send-email 1.7.5.rc3.dirty In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This variable only needs initialization when cmsgs.info is NULL. Don't use memset, just initialize every struct member. Signed-off-by: Joe Perches --- net/sctp/socket.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 33d9ee6..a5d3560 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1496,8 +1496,8 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, struct sctp_chunk *chunk; union sctp_addr to; struct sockaddr *msg_name = NULL; - struct sctp_sndrcvinfo default_sinfo = { 0 }; struct sctp_sndrcvinfo *sinfo; + struct sctp_sndrcvinfo default_sinfo; struct sctp_initmsg *sinit; sctp_assoc_t associd = 0; sctp_cmsgs_t cmsgs = { NULL }; @@ -1761,10 +1761,13 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, * some defaults. */ default_sinfo.sinfo_stream = asoc->default_stream; + default_sinfo.sinfo_ssn = 0; default_sinfo.sinfo_flags = asoc->default_flags; default_sinfo.sinfo_ppid = asoc->default_ppid; default_sinfo.sinfo_context = asoc->default_context; default_sinfo.sinfo_timetolive = asoc->default_timetolive; + default_sinfo.sinfo_tsn = 0; + default_sinfo.sinfo_cumtsn = 0; default_sinfo.sinfo_assoc_id = sctp_assoc2id(asoc); sinfo = &default_sinfo; } -- 1.7.5.rc3.dirty