diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-12-10 10:42:42 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-12-10 11:14:13 -0800 |
| commit | b9298d3f825703063c9538aa37407da43e1e4781 (patch) | |
| tree | b17463dd7194e5fd41cf79ce1115c93861450bd0 /lib/classifier.h | |
| parent | ff9d38264c74e2e807ba0fd759e44116d1203670 (diff) | |
| download | openvswitch-b9298d3f825703063c9538aa37407da43e1e4781.tar.gz | |
Expand tunnel IDs from 32 to 64 bits.
We have a need to identify tunnels with keys longer than 32 bits. This
commit adds basic datapath and OpenFlow support for such keys. It doesn't
actually add any tunnel protocols that support 64-bit keys, so this is not
very useful yet.
The 'arg' member of struct odp_msg had to be expanded to 64-bits also,
because it sometimes contains a tunnel ID. This member also contains the
argument passed to ODPAT_CONTROLLER, so I expanded that action's argument
to 64 bits also so that it can use the full width of the expanded 'arg'.
Userspace doesn't take advantage of the new space though (it was only
using 16 bits anyhow).
This commit has been tested only to the extent that it doesn't disrupt
basic Open vSwitch operation. I have not tested it with tunnel traffic.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Feature #3976.
Diffstat (limited to 'lib/classifier.h')
| -rw-r--r-- | lib/classifier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/classifier.h b/lib/classifier.h index 927423e38..453417da6 100644 --- a/lib/classifier.h +++ b/lib/classifier.h @@ -77,7 +77,7 @@ void cls_rule_zero_wildcarded_fields(struct cls_rule *); void cls_rule_set_reg(struct cls_rule *, unsigned int reg_idx, uint32_t value); void cls_rule_set_reg_masked(struct cls_rule *, unsigned int reg_idx, uint32_t value, uint32_t mask); -void cls_rule_set_tun_id(struct cls_rule *, ovs_be32 tun_id); +void cls_rule_set_tun_id(struct cls_rule *, ovs_be64 tun_id); void cls_rule_set_in_port(struct cls_rule *, uint16_t odp_port); void cls_rule_set_dl_type(struct cls_rule *, ovs_be16); void cls_rule_set_dl_src(struct cls_rule *, const uint8_t[6]); |