Merge branch 'akpm-current/current'

[karo-tx-linux.git] / net / openvswitch / flow.c

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 95cd5fd3a78046b232454431c3632403239b51ec..619f1d710eac0d9f9aab37d5d2340f91fa92b639 100644 (file)
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -698,8 +698,7 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
 {
        /* Extract metadata from packet. */
        if (tun_info) {
 {
        /* Extract metadata from packet. */
        if (tun_info) {

-               if (ip_tunnel_info_af(tun_info) != AF_INET)
-                       return -EINVAL;
+               key->tun_proto = ip_tunnel_info_af(tun_info);

                memcpy(&key->tun_key, &tun_info->key, sizeof(key->tun_key));
 
                if (tun_info->options_len) {
                memcpy(&key->tun_key, &tun_info->key, sizeof(key->tun_key));
 
                if (tun_info->options_len) {


@@ -714,6 +713,7 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
                        key->tun_opts_len = 0;
                }
        } else  {
                        key->tun_opts_len = 0;
                }
        } else  {

+               key->tun_proto = 0;

                key->tun_opts_len = 0;
                memset(&key->tun_key, 0, sizeof(key->tun_key));
        }
                key->tun_opts_len = 0;
                memset(&key->tun_key, 0, sizeof(key->tun_key));
        }