hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pktgen: Remove fill_imix_distribution() CONFIG_XFRM dependency 

Currently, the declaration of fill_imix_distribution() is dependent
on CONFIG_XFRM. This is incorrect.

Move fill_imix_distribution() declaration out of #ifndef CONFIG_XFRM
block.

Signed-off-by: Nick Richardson <richardsonnick@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nick Richardson 2021-08-18 01:31:26 +00:00 committed by David S. Miller
parent 4b1327be9f
commit 7e5a3ef6b4
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
net/core/pktgen.c
View File

@ -2601,6 +2601,32 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
pkt_dev->flows[flow].count++;
}
static void fill_imix_distribution(struct pktgen_dev *pkt_dev)
{
int cumulative_probabilites[MAX_IMIX_ENTRIES];
int j = 0;
__u64 cumulative_prob = 0;
__u64 total_weight = 0;
int i = 0;
for (i = 0; i < pkt_dev->n_imix_entries; i++)
total_weight += pkt_dev->imix_entries[i].weight;
/* Fill cumulative_probabilites with sum of normalized probabilities */
for (i = 0; i < pkt_dev->n_imix_entries - 1; i++) {
cumulative_prob += div64_u64(pkt_dev->imix_entries[i].weight *
IMIX_PRECISION,
total_weight);
cumulative_probabilites[i] = cumulative_prob;
}
cumulative_probabilites[pkt_dev->n_imix_entries - 1] = 100;
for (i = 0; i < IMIX_PRECISION; i++) {
if (i == cumulative_probabilites[j])
j++;
pkt_dev->imix_distribution[i] = j;
}
}
#ifdef CONFIG_XFRM
static u32 pktgen_dst_metrics[RTAX_MAX + 1] = {
@ -2662,33 +2688,6 @@ static void free_SAs(struct pktgen_dev *pkt_dev)
}
}
static void fill_imix_distribution(struct pktgen_dev *pkt_dev)
{
int cumulative_probabilites[MAX_IMIX_ENTRIES];
int j = 0;
__u64 cumulative_prob = 0;
__u64 total_weight = 0;
int i = 0;
for (i = 0; i < pkt_dev->n_imix_entries; i++)
total_weight += pkt_dev->imix_entries[i].weight;
/* Fill cumulative_probabilites with sum of normalized probabilities */
for (i = 0; i < pkt_dev->n_imix_entries - 1; i++) {
cumulative_prob += div64_u64(pkt_dev->imix_entries[i].weight *
IMIX_PRECISION,
total_weight);
cumulative_probabilites[i] = cumulative_prob;
}
cumulative_probabilites[pkt_dev->n_imix_entries - 1] = 100;
for (i = 0; i < IMIX_PRECISION; i++) {
if (i == cumulative_probabilites[j])
j++;
pkt_dev->imix_distribution[i] = j;
}
}
static int process_ipsec(struct pktgen_dev *pkt_dev,
struct sk_buff *skb, __be16 protocol)
{