X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=5687792dff708408048e2afcc70c38d04ddaff7f;hb=26ce31583b1654a3acaaf6de8e9567e327fbc104;hp=97a7c04df766992420cc8af90cc9f7e2e94c2846;hpb=ff8d7a5e81625bbb13d33ca73888fc848b02db83;p=openvswitch

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 97a7c04d..5687792d 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -222,8 +222,6 @@ enum ovs_vport_cmd {
  * @OVS_VPORT_ATTR_STATS: A &struct rtnl_link_stats64 giving statistics for
  * packets sent or received through the vport.
  * @OVS_VPORT_ATTR_ADDRESS: A 6-byte Ethernet address for the vport.
- * @OVS_VPORT_ATTR_MTU: MTU for the vport.  Omitted if the vport does not have
- * an MTU as, e.g., some tunnels do not.
  * @OVS_VPORT_ATTR_IFINDEX: ifindex of the underlying network device, if any.
  *
  * These attributes follow the &struct ovs_header within the Generic Netlink
@@ -237,8 +235,8 @@ enum ovs_vport_cmd {
  * %OVS_VPORT_ATTR_NAME attributes are required.  %OVS_VPORT_ATTR_PORT_NO is
  * optional; if not specified a free port number is automatically selected.
  * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
- * of vport.  %OVS_VPORT_ATTR_STATS, %OVS_VPORT_ATTR_ADDRESS, and
- * %OVS_VPORT_ATTR_MTU are optional, and other attributes are ignored.
+ * of vport.  %OVS_VPORT_ATTR_STATS and %OVS_VPORT_ATTR_ADDRESS are optional,
+ * and other attributes are ignored.
  *
  * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
  * look up the vport to operate on; otherwise dp_idx from the &struct
@@ -251,7 +249,6 @@ enum ovs_vport_attr {
 	OVS_VPORT_ATTR_NAME,	/* string name, up to IFNAMSIZ bytes long */
 	OVS_VPORT_ATTR_STATS,	/* struct rtnl_link_stats64 */
 	OVS_VPORT_ATTR_ADDRESS, /* hardware address */
-	OVS_VPORT_ATTR_MTU,	/* 32-bit maximum transmission unit */
 	OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
 	OVS_VPORT_ATTR_IFINDEX, /* 32-bit ifindex of backing netdev */
 	__OVS_VPORT_ATTR_MAX
@@ -409,8 +406,8 @@ enum ovs_action_type {
 	OVS_ACTION_ATTR_UNSPEC,
 	OVS_ACTION_ATTR_OUTPUT,	      /* Output to switch port. */
 	OVS_ACTION_ATTR_USERSPACE,    /* Send copy to userspace. */
-	OVS_ACTION_ATTR_SET_DL_TCI,   /* Set the 802.1q TCI value. */
-	OVS_ACTION_ATTR_STRIP_VLAN,   /* Strip the 802.1q header. */
+	OVS_ACTION_ATTR_PUSH_VLAN,    /* Set the 802.1q TCI value. */
+	OVS_ACTION_ATTR_POP_VLAN,     /* Strip the 802.1q header. */
 	OVS_ACTION_ATTR_SET_DL_SRC,   /* Ethernet source address. */
 	OVS_ACTION_ATTR_SET_DL_DST,   /* Ethernet destination address. */
 	OVS_ACTION_ATTR_SET_NW_SRC,   /* IPv4 source address. */