1 files changed, 19 insertions, 1 deletions

diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 405918dd7b3f..c55efaaa9bb4 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -164,6 +164,7 @@ 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_GRE,      /* GRE tunnel. */
         __OVS_VPORT_TYPE_MAX
 };
 
@@ -192,7 +193,6 @@ enum ovs_vport_type {
  * 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.
- * 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
@@ -247,11 +247,29 @@ enum ovs_key_attr {
         OVS_KEY_ATTR_ARP,       /* struct ovs_key_arp */
         OVS_KEY_ATTR_ND,        /* struct ovs_key_nd */
         OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */
+        OVS_KEY_ATTR_TUNNEL,    /* Nested set of ovs_tunnel attributes */
+
+#ifdef __KERNEL__
+        OVS_KEY_ATTR_IPV4_TUNNEL,  /* struct ovs_key_ipv4_tunnel */
+#endif
         __OVS_KEY_ATTR_MAX
 };
 
 #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
 
+enum ovs_tunnel_key_attr {
+        OVS_TUNNEL_KEY_ATTR_ID,                 /* be64 Tunnel ID */
+        OVS_TUNNEL_KEY_ATTR_IPV4_SRC,           /* be32 src IP address. */
+        OVS_TUNNEL_KEY_ATTR_IPV4_DST,           /* be32 dst IP address. */
+        OVS_TUNNEL_KEY_ATTR_TOS,                /* u8 Tunnel IP ToS. */
+        OVS_TUNNEL_KEY_ATTR_TTL,                /* u8 Tunnel IP TTL. */
+        OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT,      /* No argument, set DF. */
+        OVS_TUNNEL_KEY_ATTR_CSUM,               /* No argument. CSUM packet. */
+        __OVS_TUNNEL_KEY_ATTR_MAX
+};
+
+#define OVS_TUNNEL_KEY_ATTR_MAX (__OVS_TUNNEL_KEY_ATTR_MAX - 1)
+
 /**
  * enum ovs_frag_type - IPv4 and IPv6 fragment type
  * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.