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);
 }
 
 /*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to