From owner-svn-src-user@FreeBSD.ORG  Mon Jan  5 12:39:11 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FF9B106564A;
	Mon,  5 Jan 2009 12:39:11 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F4848FC21;
	Mon,  5 Jan 2009 12:39:11 +0000 (UTC)
	(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n05CdB5w096256;
	Mon, 5 Jan 2009 12:39:11 GMT (envelope-from piso@svn.freebsd.org)
Received: (from piso@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n05CdBjS096255;
	Mon, 5 Jan 2009 12:39:11 GMT (envelope-from piso@svn.freebsd.org)
Message-Id: <200901051239.n05CdBjS096255@svn.freebsd.org>
From: Paolo Pisati <piso@FreeBSD.org>
Date: Mon, 5 Jan 2009 12:39:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186770 - user/piso/sys/netinet/libalias
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 12:39:12 -0000

Author: piso
Date: Mon Jan  5 12:39:10 2009
New Revision: 186770
URL: http://svn.freebsd.org/changeset/base/186770

Log:
  link_type == LINK_SCTP is true only if we get called from findSctpRedirect, and
  findSctpRedirect is called from alias_sctp.c that is compiled out
  in userland, thus it's safe to undef link_type == LINK_SCTP code.

Modified:
  user/piso/sys/netinet/libalias/alias_db.c

Modified: user/piso/sys/netinet/libalias/alias_db.c
==============================================================================
--- user/piso/sys/netinet/libalias/alias_db.c	Mon Jan  5 12:18:46 2009	(r186769)
+++ user/piso/sys/netinet/libalias/alias_db.c	Mon Jan  5 12:39:10 2009	(r186770)
@@ -1280,13 +1280,11 @@ _FindLinkIn(struct libalias *la, struct 
 			src_addr = lnk->src_addr;
 			src_port = lnk->src_port;
 		}
-#ifdef _KERNEL
 		if (link_type == LINK_SCTP) {
 		  lnk->src_addr = src_addr;
 		  lnk->src_port = src_port;
 		  return(lnk);
 		}
-#endif
 		lnk = ReLink(lnk,
 		    src_addr, dst_addr, alias_addr,
 		    src_port, dst_port, alias_port,
@@ -2286,11 +2284,9 @@ LibAliasRedirectPort(struct libalias *la
 	case IPPROTO_TCP:
 		link_type = LINK_TCP;
 		break;
-#ifdef _KERNEL
 	case IPPROTO_SCTP:
 		link_type = LINK_SCTP;
 		break;
-#endif
 	default:
 #ifdef LIBALIAS_DEBUG
 		fprintf(stderr, "PacketAliasRedirectPort(): ");