openvswitch: Add gre tunnel support.

Add gre vport implementation.  Most of gre protocol processing
is pushed to gre module. It make use of gre demultiplexer
therefore it can co-exist with linux device based gre tunnels.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 1 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 999842f247a0..66ef7220293e 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -49,11 +49,27 @@ struct ovs_key_ipv4_tunnel {
         __be64 tun_id;
         __be32 ipv4_src;
         __be32 ipv4_dst;
-        u16  tun_flags;
+        __be16 tun_flags;
         u8   ipv4_tos;
         u8   ipv4_ttl;
 };
 
+static inline void ovs_flow_tun_key_init(struct ovs_key_ipv4_tunnel *tun_key,
+                                         const struct iphdr *iph, __be64 tun_id,
+                                         __be16 tun_flags)
+{
+        tun_key->tun_id = tun_id;
+        tun_key->ipv4_src = iph->saddr;
+        tun_key->ipv4_dst = iph->daddr;
+        tun_key->ipv4_tos = iph->tos;
+        tun_key->ipv4_ttl = iph->ttl;
+        tun_key->tun_flags = tun_flags;
+
+        /* clear struct padding. */
+        memset((unsigned char *) tun_key + OVS_TUNNEL_KEY_SIZE, 0,
+               sizeof(*tun_key) - OVS_TUNNEL_KEY_SIZE);
+}
+
 struct sw_flow_key {
         struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
         struct {