diff options
| author | Jesse Gross <jesse@nicira.com> | 2013-01-25 14:12:44 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-01-28 10:26:32 -0800 |
| commit | 953753fa4d8bdfcdc718cf8c38184589d4d6b13b (patch) | |
| tree | 8eb1b995da8387d7ade13efee30277ce3561a2c1 /include/linux | |
| parent | 35c8984e5e6c5d08ca934b82734a7c0b4872ccf6 (diff) | |
| download | openvswitch-953753fa4d8bdfcdc718cf8c38184589d4d6b13b.tar.gz | |
datapath: Remove compatibility GRE identifier.
We want to move the GRE vport ID into the upstream range but in
order to ease the transition kept the old ID around for one release.
This removes the old value.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/openvswitch.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index 738309771..5ad0bc00c 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -182,11 +182,10 @@ enum ovs_vport_type { OVS_VPORT_TYPE_UNSPEC, OVS_VPORT_TYPE_NETDEV, /* network device */ OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */ - OVS_VPORT_TYPE_FT_GRE, /* Flow based GRE tunnel. */ + OVS_VPORT_TYPE_GRE, /* GRE tunnel. */ OVS_VPORT_TYPE_VXLAN, /* VXLAN tunnel */ OVS_VPORT_TYPE_PATCH = 100, /* virtual tunnel connecting two vports */ - OVS_VPORT_TYPE_GRE, /* GRE tunnel */ - OVS_VPORT_TYPE_CAPWAP, /* CAPWAP tunnel */ + OVS_VPORT_TYPE_CAPWAP = 102, /* CAPWAP tunnel */ OVS_VPORT_TYPE_GRE64 = 104, /* GRE tunnel with 64-bit keys */ __OVS_VPORT_TYPE_MAX }; |