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>

1 files changed, 6 insertions, 14 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 0cce8e60d5ed..7e0819919b8a 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -237,33 +237,25 @@ void ovs_dp_detach_port(struct vport *p)
 }
 
 /* Must be called with rcu_read_lock. */
-void ovs_dp_process_received_packet(struct sk_buff *skb)
+void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
 {
         const struct vport *p = OVS_CB(skb)->input_vport;
         struct datapath *dp = p->dp;
         struct sw_flow *flow;
         struct dp_stats_percpu *stats;
-        struct sw_flow_key key;
         u64 *stats_counter;
         u32 n_mask_hit;
-        int error;
 
         stats = this_cpu_ptr(dp->stats_percpu);
 
-        /* Extract flow from 'skb' into 'key'. */
-        error = ovs_flow_key_extract(skb, &key);
-        if (unlikely(error)) {
-                kfree_skb(skb);
-                return;
-        }
-
         /* Look up flow. */
-        flow = ovs_flow_tbl_lookup_stats(&dp->table, &key, &n_mask_hit);
+        flow = ovs_flow_tbl_lookup_stats(&dp->table, key, &n_mask_hit);
         if (unlikely(!flow)) {
                 struct dp_upcall_info upcall;
+                int error;
 
                 upcall.cmd = OVS_PACKET_CMD_MISS;
-                upcall.key = &key;
+                upcall.key = key;
                 upcall.userdata = NULL;
                 upcall.portid = ovs_vport_find_upcall_portid(p, skb);
                 error = ovs_dp_upcall(dp, skb, &upcall);
@@ -277,8 +269,8 @@ void ovs_dp_process_received_packet(struct sk_buff *skb)
 
         OVS_CB(skb)->flow = flow;
 
-        ovs_flow_stats_update(OVS_CB(skb)->flow, key.tp.flags, skb);
-        ovs_execute_actions(dp, skb, &key);
+        ovs_flow_stats_update(OVS_CB(skb)->flow, key->tp.flags, skb);
+        ovs_execute_actions(dp, skb, key);
         stats_counter = &stats->n_hit;
 
 out: