From owner-svn-src-user@FreeBSD.ORG  Wed Oct 14 21:39:48 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 45A681065679;
	Wed, 14 Oct 2009 21:39:48 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C24B8FC0A;
	Wed, 14 Oct 2009 21:39:48 +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 n9ELdl3o049411;
	Wed, 14 Oct 2009 21:39:47 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9ELdlqg049408;
	Wed, 14 Oct 2009 21:39:47 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910142139.n9ELdlqg049408@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Wed, 14 Oct 2009 21:39:47 +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: r198101 - user/eri/pf45/head/sys/contrib/pf/net
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: Wed, 14 Oct 2009 21:39:48 -0000

Author: eri
Date: Wed Oct 14 21:39:47 2009
New Revision: 198101
URL: http://svn.freebsd.org/changeset/base/198101

Log:
  These functions are not used in FreeBSD(pf_find/pf_get)_divert).

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf.c
  user/eri/pf45/head/sys/contrib/pf/net/pfvar.h

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf.c	Wed Oct 14 21:34:52 2009	(r198100)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf.c	Wed Oct 14 21:39:47 2009	(r198101)
@@ -336,7 +336,9 @@ void			 pf_set_rt_ifp(struct pf_state *,
 			    struct pf_addr *);
 int			 pf_check_proto_cksum(struct mbuf *, int, int,
 			    u_int8_t, sa_family_t);
+#ifndef __FreeBSD__
 struct pf_divert	*pf_get_divert(struct mbuf *);
+#endif
 void			 pf_print_state_parts(struct pf_state *,
 			    struct pf_state_key *, struct pf_state_key *);
 int			 pf_addr_wrap_neq(struct pf_addr_wrap *,
@@ -6358,25 +6360,21 @@ pf_check_proto_cksum(struct mbuf *m, int
 }
 #endif
 
+#ifndef __FreeBSD__
 struct pf_divert *
 pf_find_divert(struct mbuf *m)
 {
-#ifdef notyet
 	struct m_tag    *mtag;
 
 	if ((mtag = m_tag_find(m, PACKET_TAG_PF_DIVERT, NULL)) == NULL)
 		return (NULL);
 
 	return ((struct pf_divert *)(mtag + 1));
-#else
-	return NULL;
-#endif
 }
 
 struct pf_divert *
 pf_get_divert(struct mbuf *m)
 {
-#ifdef notyet
 	struct m_tag    *mtag;
 
 	if ((mtag = m_tag_find(m, PACKET_TAG_PF_DIVERT, NULL)) == NULL) {
@@ -6389,10 +6387,8 @@ pf_get_divert(struct mbuf *m)
 	}
 
 	return ((struct pf_divert *)(mtag + 1));
-#else
-	return NULL;
-#endif
 }
+#endif
 
 #ifdef INET
 int

Modified: user/eri/pf45/head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Wed Oct 14 21:34:52 2009	(r198100)
+++ user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Wed Oct 14 21:39:47 2009	(r198101)
@@ -1928,7 +1928,9 @@ extern void			 pf_addrcpy(struct pf_addr
 				    u_int8_t);
 void				 pf_rm_rule(struct pf_rulequeue *,
 				    struct pf_rule *);
+#ifndef __FreeBSD__
 struct pf_divert		*pf_find_divert(struct mbuf *);
+#endif
 
 #ifdef INET
 #ifdef __FreeBSD__