Date: Sun, 16 May 2010 16:50:33 +0000 (UTC) From: Randall Stewart <rrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r208156 - stable/8/sys/netinet Message-ID: <201005161650.o4GGoXhs058575@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005161650.o4GGoXhs058575>