From owner-svn-src-all@FreeBSD.ORG Sun Jan 17 17:49:29 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A919106566B; Sun, 17 Jan 2010 17:49:29 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 296CC8FC0A; Sun, 17 Jan 2010 17:49:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0HHnTRJ098897; Sun, 17 Jan 2010 17:49:29 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0HHnS6S098863; Sun, 17 Jan 2010 17:49:28 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201001171749.o0HHnS6S098863@svn.freebsd.org> From: Michael Tuexen Date: Sun, 17 Jan 2010 17:49:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202499 - stable/8/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2010 17:49:29 -0000 Author: tuexen Date: Sun Jan 17 17:49:28 2010 New Revision: 202499 URL: http://svn.freebsd.org/changeset/base/202499 Log: MFC 199459 Get rid of unused fields addr_over which is never really used, only copied around. Modified: stable/8/sys/netinet/sctp_output.c stable/8/sys/netinet/sctp_structs.h stable/8/sys/netinet/sctputil.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/netinet/sctp_output.c ============================================================================== --- stable/8/sys/netinet/sctp_output.c Sun Jan 17 17:46:48 2010 (r202498) +++ stable/8/sys/netinet/sctp_output.c Sun Jan 17 17:49:28 2010 (r202499) @@ -5875,10 +5875,8 @@ sctp_msg_append(struct sctp_tcb *stcb, sp->strseq = 0; if (sp->sinfo_flags & SCTP_ADDR_OVER) { sp->net = net; - sp->addr_over = 1; } else { sp->net = stcb->asoc.primary_destination; - sp->addr_over = 0; } atomic_add_int(&sp->net->ref_count, 1); (void)SCTP_GETTIME_TIMEVAL(&sp->ts); @@ -7052,7 +7050,6 @@ dont_do_it: chk->rec.data.timetodrop = sp->ts; chk->flags = sp->act_flags; - chk->addr_over = sp->addr_over; chk->whoTo = net; atomic_add_int(&chk->whoTo->ref_count, 1); @@ -12252,10 +12249,8 @@ skip_copy: } else { if (sp->sinfo_flags & SCTP_ADDR_OVER) { sp->net = net; - sp->addr_over = 1; } else { sp->net = asoc->primary_destination; - sp->addr_over = 0; } atomic_add_int(&sp->net->ref_count, 1); sctp_set_prsctp_policy(sp); Modified: stable/8/sys/netinet/sctp_structs.h ============================================================================== --- stable/8/sys/netinet/sctp_structs.h Sun Jan 17 17:46:48 2010 (r202498) +++ stable/8/sys/netinet/sctp_structs.h Sun Jan 17 17:49:28 2010 (r202499) @@ -364,9 +364,6 @@ struct sctp_tmit_chunk { uint8_t pad_inplace; uint8_t do_rtt; uint8_t book_size_scale; - uint8_t addr_over; /* flag which is set if the dest address for - * this chunk is overridden by user. Used for - * CMT (iyengar@cis.udel.edu, 2005/06/21) */ uint8_t no_fr_allowed; uint8_t pr_sctp_on; uint8_t copy_by_ref; @@ -444,7 +441,6 @@ struct sctp_stream_queue_pending { uint8_t holds_key_ref; uint8_t msg_is_complete; uint8_t some_taken; - uint8_t addr_over; uint8_t pr_sctp_on; uint8_t sender_all_done; uint8_t put_last_out; Modified: stable/8/sys/netinet/sctputil.c ============================================================================== --- stable/8/sys/netinet/sctputil.c Sun Jan 17 17:46:48 2010 (r202498) +++ stable/8/sys/netinet/sctputil.c Sun Jan 17 17:49:28 2010 (r202499) @@ -4791,7 +4791,6 @@ next_on_sent: chk->rec.data.payloadtype = sp->ppid; chk->rec.data.context = sp->context; chk->flags = sp->act_flags; - chk->addr_over = sp->addr_over; chk->whoTo = sp->net; atomic_add_int(&chk->whoTo->ref_count, 1); chk->rec.data.TSN_seq = atomic_fetchadd_int(&stcb->asoc.sending_seq, 1);