diff options
Diffstat (limited to 'net/openvswitch/flow.c')
-rw-r--r-- | net/openvswitch/flow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 913bdc1a83c0..2924cb340868 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c | |||
@@ -642,12 +642,12 @@ int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) | |||
642 | return key_extract(skb, key); | 642 | return key_extract(skb, key); |
643 | } | 643 | } |
644 | 644 | ||
645 | int ovs_flow_key_extract(struct ovs_key_ipv4_tunnel *tun_key, | 645 | int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info, |
646 | struct sk_buff *skb, struct sw_flow_key *key) | 646 | struct sk_buff *skb, struct sw_flow_key *key) |
647 | { | 647 | { |
648 | /* Extract metadata from packet. */ | 648 | /* Extract metadata from packet. */ |
649 | if (tun_key) | 649 | if (tun_info) |
650 | memcpy(&key->tun_key, tun_key, sizeof(key->tun_key)); | 650 | memcpy(&key->tun_key, &tun_info->tunnel, sizeof(key->tun_key)); |
651 | else | 651 | else |
652 | memset(&key->tun_key, 0, sizeof(key->tun_key)); | 652 | memset(&key->tun_key, 0, sizeof(key->tun_key)); |
653 | 653 | ||