From owner-svn-src-head@FreeBSD.ORG Fri Mar 12 19:58:51 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBD371065678; Fri, 12 Mar 2010 19:58:51 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCF478FC26; Fri, 12 Mar 2010 19:58:51 +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 o2CJwpDs098636; Fri, 12 Mar 2010 19:58:51 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2CJwpTO098634; Fri, 12 Mar 2010 19:58:51 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201003121958.o2CJwpTO098634@svn.freebsd.org> From: Kip Macy Date: Fri, 12 Mar 2010 19:58:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205097 - head/sys/net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2010 19:58:51 -0000 Author: kmacy Date: Fri Mar 12 19:58:51 2010 New Revision: 205097 URL: http://svn.freebsd.org/changeset/base/205097 Log: flowtable_get_hashkey is only used by a DDB function - move under #ifdef DDB pointed out by jkim@ Modified: head/sys/net/flowtable.c Modified: head/sys/net/flowtable.c ============================================================================== --- head/sys/net/flowtable.c Fri Mar 12 19:43:39 2010 (r205096) +++ head/sys/net/flowtable.c Fri Mar 12 19:58:51 2010 (r205097) @@ -905,20 +905,6 @@ flowtable_set_hashkey(struct flentry *fl hashkey[i] = key[i]; } - -static uint32_t * -flowtable_get_hashkey(struct flentry *fle) -{ - uint32_t *hashkey; - - if (fle->f_flags & FL_IPV6) - hashkey = ((struct flentry_v4 *)fle)->fl_flow.ipf_key; - else - hashkey = ((struct flentry_v6 *)fle)->fl_flow.ipf_key; - - return (hashkey); -} - static int flowtable_insert(struct flowtable *ft, uint32_t hash, uint32_t *key, uint32_t fibnum, struct route *ro, uint16_t flags) @@ -1601,6 +1587,19 @@ VNET_SYSUNINIT(flowtable_uninit, SI_SUB_ #endif #ifdef DDB +static uint32_t * +flowtable_get_hashkey(struct flentry *fle) +{ + uint32_t *hashkey; + + if (fle->f_flags & FL_IPV6) + hashkey = ((struct flentry_v4 *)fle)->fl_flow.ipf_key; + else + hashkey = ((struct flentry_v6 *)fle)->fl_flow.ipf_key; + + return (hashkey); +} + static bitstr_t * flowtable_mask_pcpu(struct flowtable *ft, int cpuid) {