1 files changed, 19 insertions, 0 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index f7e589159e4a..ceb618cf1292 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -564,6 +564,7 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 static int output_userspace(struct datapath *dp, struct sk_buff *skb,
                             struct sw_flow_key *key, const struct nlattr *attr)
 {
+        struct ovs_tunnel_info info;
         struct dp_upcall_info upcall;
         const struct nlattr *a;
         int rem;
@@ -572,6 +573,7 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
         upcall.key = key;
         upcall.userdata = NULL;
         upcall.portid = 0;
+        upcall.egress_tun_info = NULL;
 
         for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
                  a = nla_next(a, &rem)) {
@@ -583,7 +585,24 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
                 case OVS_USERSPACE_ATTR_PID:
                         upcall.portid = nla_get_u32(a);
                         break;
+
+                case OVS_USERSPACE_ATTR_EGRESS_TUN_PORT: {
+                        /* Get out tunnel info. */
+                        struct vport *vport;
+
+                        vport = ovs_vport_rcu(dp, nla_get_u32(a));
+                        if (vport) {
+                                int err;
+
+                                err = ovs_vport_get_egress_tun_info(vport, skb,
+                                                                    &info);
+                                if (!err)
+                                        upcall.egress_tun_info = &info;
+                        }
+                        break;
                 }
+
+                } /* End of switch. */
         }
 
         return ovs_dp_upcall(dp, skb, &upcall);