diff options
| author | Simon Horman <horms@verge.net.au> | 2013-05-02 10:49:49 +0900 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-05-01 19:34:05 -0700 |
| commit | 20131cefeb4c033e1c3cfaea03e06c6b86a6d98d (patch) | |
| tree | 02406216066aa28f23585ebe5ff9826a3139005d /include/linux | |
| parent | b82b19e93801a26b155f0191c70aba2fbbbdad42 (diff) | |
| download | openvswitch-20131cefeb4c033e1c3cfaea03e06c6b86a6d98d.tar.gz | |
Make it more obvious that OVS_KEY_ATTR_MPLS may be an array
Note that OVS_KEY_ATTR_MPLS may be an array of ovs_key_mpls
and that the acceptable length may be restricted by the implementation.
Currently the user-space datapath and proposed kernel datapath
implementation restrict the length to a single element.
Also update the mpls_top_lse name of the element of struct ovs_key_mpls,
as it is an array of LSEs and thus not necessarily just the top LSE.
As requested by Jesse Gross
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/openvswitch.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index bd2f05f8d..e890fd82d 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -287,7 +287,9 @@ enum ovs_key_attr { OVS_KEY_ATTR_IPV4_TUNNEL, /* struct ovs_key_ipv4_tunnel */ #endif - OVS_KEY_ATTR_MPLS = 62, /* struct ovs_key_mpls */ + OVS_KEY_ATTR_MPLS = 62, /* array of struct ovs_key_mpls. + * The implementation may restrict + * the accepted length of the array. */ __OVS_KEY_ATTR_MAX }; @@ -330,7 +332,7 @@ struct ovs_key_ethernet { }; struct ovs_key_mpls { - __be32 mpls_top_lse; + __be32 mpls_lse; }; struct ovs_key_ipv4 { |