From owner-svn-src-user@FreeBSD.ORG Sat Jan 3 17:22:06 2009 Return-Path: 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 424A1106566B; Sat, 3 Jan 2009 17:22:06 +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 319878FC13; Sat, 3 Jan 2009 17:22:06 +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 n03HM5eT033523; Sat, 3 Jan 2009 17:22:05 GMT (envelope-from piso@svn.freebsd.org) Received: (from piso@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n03HM5Ff033522; Sat, 3 Jan 2009 17:22:05 GMT (envelope-from piso@svn.freebsd.org) Message-Id: <200901031722.n03HM5Ff033522@svn.freebsd.org> From: Paolo Pisati Date: Sat, 3 Jan 2009 17:22:05 +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: r186726 - user/piso/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jan 2009 17:22:06 -0000 Author: piso Date: Sat Jan 3 17:22:05 2009 New Revision: 186726 URL: http://svn.freebsd.org/changeset/base/186726 Log: -get rid of #ifdef _ALIAS_SCTP -white space Modified: user/piso/sys/netinet/ip_fw_nat.c Modified: user/piso/sys/netinet/ip_fw_nat.c ============================================================================== --- user/piso/sys/netinet/ip_fw_nat.c Sat Jan 3 17:13:37 2009 (r186725) +++ user/piso/sys/netinet/ip_fw_nat.c Sat Jan 3 17:22:05 2009 (r186726) @@ -326,12 +326,10 @@ ipfw_nat(struct ip_fw_args *args, struct else retval = LibAliasOut(t->lib, c, mcl->m_len + M_TRAILINGSPACE(mcl)); -#ifdef _ALIAS_SCTP if (retval == PKT_ALIAS_RESPOND) { m->m_flags |= M_SKIP_FIREWALL; retval = PKT_ALIAS_OK; } -#endif if (retval != PKT_ALIAS_OK && retval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { /* XXX - should i add some logging? */ @@ -407,7 +405,6 @@ ipfw_nat(struct ip_fw_args *args, struct } args->m = mcl; - return (IP_FW_NAT); }