diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2014-09-16 06:28:44 +0400 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2014-09-16 10:28:13 +0400 |
| commit | 8c8b1b83fcdd0f05e1f66ed6f8a2e831d5d374a2 (patch) | |
| tree | 639e2202b5ded18df0c38daabedcdeeb3e6c2482 /net/openvswitch/flow.c | |
| parent | 83c8df26a3b654871c0503fcf6eac61777e12ea1 (diff) | |
| download | linux-8c8b1b83fcdd0f05e1f66ed6f8a2e831d5d374a2.tar.xz | |
openvswitch: Use tun_key only for egress tunnel path.
Currently tun_key is used for passing tunnel information
on ingress and egress path, this cause confusion. Following
patch removes its use on ingress path make it egress only parameter.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index d186eb65a391..bf8442071d75 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -606,12 +606,13 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) return 0; } -int ovs_flow_key_extract(struct sk_buff *skb, struct sw_flow_key *key) +int ovs_flow_key_extract(struct ovs_key_ipv4_tunnel *tun_key, + struct sk_buff *skb, struct sw_flow_key *key) { /* Extract metadata from packet. */ memset(key, 0, sizeof(*key)); - if (OVS_CB(skb)->tun_key) - memcpy(&key->tun_key, OVS_CB(skb)->tun_key, sizeof(key->tun_key)); + if (tun_key) + memcpy(&key->tun_key, tun_key, sizeof(key->tun_key)); key->phy.priority = skb->priority; key->phy.in_port = OVS_CB(skb)->input_vport->port_no; |