From owner-svn-src-stable@FreeBSD.ORG Sun May 16 16:50:34 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34E52106564A; Sun, 16 May 2010 16:50:34 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 086188FC16; Sun, 16 May 2010 16:50:34 +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 o4GGoXxq058578; Sun, 16 May 2010 16:50:33 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4GGoXhs058575; Sun, 16 May 2010 16:50:33 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <201005161650.o4GGoXhs058575@svn.freebsd.org> From: Randall Stewart Date: Sun, 16 May 2010 16:50:33 +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: r208156 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 16:50:34 -0000 Author: rrs Date: Sun May 16 16:50:33 2010 New Revision: 208156 URL: http://svn.freebsd.org/changeset/base/208156 Log: MFC 207966 (for Michael) Get rid of unused constants. Modified: stable/8/sys/netinet/sctp_constants.h stable/8/sys/netinet/sctp_indata.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) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/netinet/sctp_constants.h ============================================================================== --- stable/8/sys/netinet/sctp_constants.h Sun May 16 16:45:49 2010 (r208155) +++ stable/8/sys/netinet/sctp_constants.h Sun May 16 16:50:33 2010 (r208156) @@ -361,14 +361,6 @@ __FBSDID("$FreeBSD$"); * hit this value) */ #define SCTP_DATAGRAM_RESEND 4 #define SCTP_DATAGRAM_ACKED 10010 -/* EY - * If a tsn is nr-gapped, its first tagged as NR_MARKED and then NR_ACKED - * When yet another nr-sack is received, if a particular TSN's sent tag - * is observed to be NR_ACKED after gap-ack info is processed, this implies - * that particular TSN is reneged -*/ -#define SCTP_DATAGRAM_NR_ACKED 10020 -#define SCTP_DATAGRAM_NR_MARKED 20005 #define SCTP_DATAGRAM_MARKED 20010 #define SCTP_FORWARD_TSN_SKIP 30010 Modified: stable/8/sys/netinet/sctp_indata.c ============================================================================== --- stable/8/sys/netinet/sctp_indata.c Sun May 16 16:45:49 2010 (r208155) +++ stable/8/sys/netinet/sctp_indata.c Sun May 16 16:50:33 2010 (r208156) @@ -4917,14 +4917,6 @@ done_with_it: if (tp1 != NULL) { /* Peer revoked all dg's marked or acked */ TAILQ_FOREACH(tp1, &asoc->sent_queue, sctp_next) { - /* - * EY- maybe check only if it is nr_acked - * nr_marked may not be possible - */ - if ((tp1->sent == SCTP_DATAGRAM_NR_ACKED) || - (tp1->sent == SCTP_DATAGRAM_NR_MARKED)) { - continue; - } if (tp1->sent == SCTP_DATAGRAM_ACKED) { tp1->sent = SCTP_DATAGRAM_SENT; if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_FLIGHT_LOGGING_ENABLE) {