aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/vport.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/openvswitch/vport.c')
-rw-r--r--net/openvswitch/vport.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 5df8377fcfb1..3e50ee8a218c 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -432,7 +432,7 @@ u32 ovs_vport_find_upcall_portid(const struct vport *p, struct sk_buff *skb)
432 * skb->data should point to the Ethernet header. 432 * skb->data should point to the Ethernet header.
433 */ 433 */
434void ovs_vport_receive(struct vport *vport, struct sk_buff *skb, 434void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
435 struct ovs_key_ipv4_tunnel *tun_key) 435 struct ovs_tunnel_info *tun_info)
436{ 436{
437 struct pcpu_sw_netstats *stats; 437 struct pcpu_sw_netstats *stats;
438 struct sw_flow_key key; 438 struct sw_flow_key key;
@@ -445,9 +445,9 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
445 u64_stats_update_end(&stats->syncp); 445 u64_stats_update_end(&stats->syncp);
446 446
447 OVS_CB(skb)->input_vport = vport; 447 OVS_CB(skb)->input_vport = vport;
448 OVS_CB(skb)->egress_tun_key = NULL; 448 OVS_CB(skb)->egress_tun_info = NULL;
449 /* Extract flow from 'skb' into 'key'. */ 449 /* Extract flow from 'skb' into 'key'. */
450 error = ovs_flow_key_extract(tun_key, skb, &key); 450 error = ovs_flow_key_extract(tun_info, skb, &key);
451 if (unlikely(error)) { 451 if (unlikely(error)) {
452 kfree_skb(skb); 452 kfree_skb(skb);
453 return; 453 return;