From owner-svn-src-head@FreeBSD.ORG Wed Oct 22 21:20:38 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11DF5E0; Wed, 22 Oct 2014 21:20:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1279608; Wed, 22 Oct 2014 21:20:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9MLKbMO080216; Wed, 22 Oct 2014 21:20:37 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9MLKb6E080215; Wed, 22 Oct 2014 21:20:37 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201410222120.s9MLKb6E080215@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Wed, 22 Oct 2014 21:20:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273483 - head/sys/netpfil/ipfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Wed, 22 Oct 2014 21:20:38 -0000 Author: melifaro Date: Wed Oct 22 21:20:37 2014 New Revision: 273483 URL: https://svnweb.freebsd.org/changeset/base/273483 Log: Rename log2 to tal_log2. Submitted by: luigi Modified: head/sys/netpfil/ipfw/ip_fw_table_algo.c Modified: head/sys/netpfil/ipfw/ip_fw_table_algo.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table_algo.c Wed Oct 22 21:04:54 2014 (r273482) +++ head/sys/netpfil/ipfw/ip_fw_table_algo.c Wed Oct 22 21:20:37 2014 (r273483) @@ -954,7 +954,7 @@ static int ta_lookup_chash_64(struct tab static int chash_parse_opts(struct chash_cfg *cfg, char *data); static void ta_print_chash_config(void *ta_state, struct table_info *ti, char *buf, size_t bufsize); -static int log2(uint32_t v); +static int ta_log2(uint32_t v); static int ta_init_chash(struct ip_fw_chain *ch, void **ta_state, struct table_info *ti, char *data, uint8_t tflags); static void ta_destroy_chash(void *ta_state, struct table_info *ti); @@ -1248,7 +1248,7 @@ ta_print_chash_config(void *ta_state, st } static int -log2(uint32_t v) +ta_log2(uint32_t v) { uint32_t r; @@ -1300,7 +1300,7 @@ ta_init_chash(struct ip_fw_chain *ch, vo ti->xstate = cfg->head6; /* Store data depending on v6 mask length */ - hsize = log2(cfg->size4) << 8 | log2(cfg->size6); + hsize = ta_log2(cfg->size4) << 8 | ta_log2(cfg->size6); if (cfg->mask6 == 64) { ti->data = (32 - cfg->mask4) << 24 | (128 - cfg->mask6) << 16| hsize; @@ -1838,7 +1838,7 @@ ta_modify_chash(void *ta_state, struct t /* Update lower 32 bits with new values */ ti->data &= 0xFFFFFFFF00000000; - ti->data |= log2(cfg->size4) << 8 | log2(cfg->size6); + ti->data |= ta_log2(cfg->size4) << 8 | ta_log2(cfg->size6); } /*