d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename log2 to tal_log2.

Browse Source 
Submitted by:	luigi
This commit is contained in:
Alexander V. Chernikov 2014-10-22 21:20:37 +00:00
parent 481e594b9b
commit 9e3a53fd35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netpfil/ipfw/ip_fw_table_algo.c
View File

@ -954,7 +954,7 @@ static int ta_lookup_chash_64(struct table_info *ti, void *key, uint32_t keylen,
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, struct table_info *ti, char *buf,
}
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, void **ta_state, struct table_info *ti,
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 table_info *ti, void *ta_buf,
/* 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);
}
/*