git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expand tunnel IDs from 32 to 64 bits.
[sliver-openvswitch.git]
/
lib
/
classifier.c
diff --git
a/lib/classifier.c
b/lib/classifier.c
index
4905837
..
86d8269
100644
(file)
--- a/
lib/classifier.c
+++ b/
lib/classifier.c
@@
-128,7
+128,7
@@
cls_rule_set_reg_masked(struct cls_rule *rule, unsigned int reg_idx,
}
void
}
void
-cls_rule_set_tun_id(struct cls_rule *rule, ovs_be
32
tun_id)
+cls_rule_set_tun_id(struct cls_rule *rule, ovs_be
64
tun_id)
{
rule->wc.wildcards &= ~FWW_TUN_ID;
rule->flow.tun_id = tun_id;
{
rule->wc.wildcards &= ~FWW_TUN_ID;
rule->flow.tun_id = tun_id;
@@
-394,7
+394,7
@@
cls_rule_format(const struct cls_rule *rule, struct ds *s)
}
}
if (!(w & FWW_TUN_ID)) {
}
}
if (!(w & FWW_TUN_ID)) {
- ds_put_format(s, "tun_id=0x%"PRIx
32",", ntoh
l(f->tun_id));
+ ds_put_format(s, "tun_id=0x%"PRIx
64",", ntohl
l(f->tun_id));
}
if (!(w & FWW_IN_PORT)) {
ds_put_format(s, "in_port=%"PRIu16",",
}
if (!(w & FWW_IN_PORT)) {
ds_put_format(s, "in_port=%"PRIu16",",
@@
-932,7
+932,7
@@
flow_equal_except(const struct flow *a, const struct flow *b,
const flow_wildcards_t wc = wildcards->wildcards;
int i;
const flow_wildcards_t wc = wildcards->wildcards;
int i;
- BUILD_ASSERT_DECL(FLOW_SIG_SIZE ==
36
+ FLOW_N_REGS * 4);
+ BUILD_ASSERT_DECL(FLOW_SIG_SIZE ==
40
+ FLOW_N_REGS * 4);
for (i = 0; i < FLOW_N_REGS; i++) {
if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) {
for (i = 0; i < FLOW_N_REGS; i++) {
if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) {
@@
-968,7
+968,7
@@
zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
const flow_wildcards_t wc = wildcards->wildcards;
int i;
const flow_wildcards_t wc = wildcards->wildcards;
int i;
- BUILD_ASSERT_DECL(FLOW_SIG_SIZE ==
36
+ 4 * FLOW_N_REGS);
+ BUILD_ASSERT_DECL(FLOW_SIG_SIZE ==
40
+ 4 * FLOW_N_REGS);
for (i = 0; i < FLOW_N_REGS; i++) {
flow->regs[i] &= wildcards->reg_masks[i];
for (i = 0; i < FLOW_N_REGS; i++) {
flow->regs[i] &= wildcards->reg_masks[i];