13 files changed, 83 insertions, 165 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index c6087233d7fc..221fa8b37a47 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -769,7 +769,6 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
                             struct sw_flow_key *key, const struct nlattr *attr,
                             const struct nlattr *actions, int actions_len)
 {
-        struct ip_tunnel_info info;
         struct dp_upcall_info upcall;
         const struct nlattr *a;
         int rem;
@@ -797,11 +796,9 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
                         if (vport) {
                                 int err;
 
-                                upcall.egress_tun_info = &info;
-                                err = ovs_vport_get_egress_tun_info(vport, skb,
-                                                                    &upcall);
-                                if (err)
-                                        upcall.egress_tun_info = NULL;
+                                err = dev_fill_metadata_dst(vport->dev, skb);
+                                if (!err)
+                                        upcall.egress_tun_info = skb_tunnel_info(skb);
                         }
 
                         break;
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 9ed833e9bb7d..bd165ee2bb16 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -151,6 +151,8 @@ static void ovs_ct_update_key(const struct sk_buff *skb,
         ct = nf_ct_get(skb, &ctinfo);
         if (ct) {
                 state = ovs_ct_get_state(ctinfo);
+                if (!nf_ct_is_confirmed(ct))
+                        state |= OVS_CS_F_NEW;
                 if (ct->master)
                         state |= OVS_CS_F_RELATED;
                 zone = nf_ct_zone(ct);
@@ -222,9 +224,6 @@ static int ovs_ct_set_labels(struct sk_buff *skb, struct sw_flow_key *key,
         struct nf_conn *ct;
         int err;
 
-        if (!IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS))
-                return -ENOTSUPP;
-
         /* The connection could be invalid, in which case set_label is no-op.*/
         ct = nf_ct_get(skb, &ctinfo);
         if (!ct)
@@ -377,7 +376,7 @@ static bool skb_nfct_cached(const struct net *net, const struct sk_buff *skb,
         return true;
 }
 
-static int __ovs_ct_lookup(struct net *net, const struct sw_flow_key *key,
+static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                            const struct ovs_conntrack_info *info,
                            struct sk_buff *skb)
 {
@@ -408,6 +407,8 @@ static int __ovs_ct_lookup(struct net *net, const struct sw_flow_key *key,
                 }
         }
 
+        ovs_ct_update_key(skb, key, true);
+
         return 0;
 }
 
@@ -430,8 +431,6 @@ static int ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                 err = __ovs_ct_lookup(net, key, info, skb);
                 if (err)
                         return err;
-
-                ovs_ct_update_key(skb, key, true);
         }
 
         return 0;
@@ -460,8 +459,6 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,
         if (nf_conntrack_confirm(skb) != NF_ACCEPT)
                 return -EINVAL;
 
-        ovs_ct_update_key(skb, key, true);
-
         return 0;
 }
 
@@ -587,6 +584,10 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
                 case OVS_CT_ATTR_MARK: {
                         struct md_mark *mark = nla_data(a);
 
+                        if (!mark->mask) {
+                                OVS_NLERR(log, "ct_mark mask cannot be 0");
+                                return -EINVAL;
+                        }
                         info->mark = *mark;
                         break;
                 }
@@ -595,6 +596,10 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
                 case OVS_CT_ATTR_LABELS: {
                         struct md_labels *labels = nla_data(a);
 
+                        if (!labels_nonzero(&labels->mask)) {
+                                OVS_NLERR(log, "ct_labels mask cannot be 0");
+                                return -EINVAL;
+                        }
                         info->labels = *labels;
                         break;
                 }
@@ -705,11 +710,12 @@ int ovs_ct_action_to_attr(const struct ovs_conntrack_info *ct_info,
         if (IS_ENABLED(CONFIG_NF_CONNTRACK_ZONES) &&
             nla_put_u16(skb, OVS_CT_ATTR_ZONE, ct_info->zone.id))
                 return -EMSGSIZE;
-        if (IS_ENABLED(CONFIG_NF_CONNTRACK_MARK) &&
+        if (IS_ENABLED(CONFIG_NF_CONNTRACK_MARK) && ct_info->mark.mask &&
             nla_put(skb, OVS_CT_ATTR_MARK, sizeof(ct_info->mark),
                     &ct_info->mark))
                 return -EMSGSIZE;
         if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
+            labels_nonzero(&ct_info->labels.mask) &&
             nla_put(skb, OVS_CT_ATTR_LABELS, sizeof(ct_info->labels),
                     &ct_info->labels))
                 return -EMSGSIZE;
diff --git a/net/openvswitch/conntrack.h b/net/openvswitch/conntrack.h
index da8714942c95..82e0dfc66028 100644
--- a/net/openvswitch/conntrack.h
+++ b/net/openvswitch/conntrack.h
@@ -35,12 +35,9 @@ void ovs_ct_fill_key(const struct sk_buff *skb, struct sw_flow_key *key);
 int ovs_ct_put_key(const struct sw_flow_key *key, struct sk_buff *skb);
 void ovs_ct_free_action(const struct nlattr *a);
 
-static inline bool ovs_ct_state_supported(u32 state)
-{
-        return !(state & ~(OVS_CS_F_NEW | OVS_CS_F_ESTABLISHED |
-                         OVS_CS_F_RELATED | OVS_CS_F_REPLY_DIR |
-                         OVS_CS_F_INVALID | OVS_CS_F_TRACKED));
-}
+#define CT_SUPPORTED_MASK (OVS_CS_F_NEW | OVS_CS_F_ESTABLISHED | \
+                           OVS_CS_F_RELATED | OVS_CS_F_REPLY_DIR | \
+                           OVS_CS_F_INVALID | OVS_CS_F_TRACKED)
 #else
 #include <linux/errno.h>
 
@@ -53,11 +50,6 @@ static inline bool ovs_ct_verify(struct net *net, int attr)
         return false;
 }
 
-static inline bool ovs_ct_state_supported(u32 state)
-{
-        return false;
-}
-
 static inline int ovs_ct_copy_action(struct net *net, const struct nlattr *nla,
                                      const struct sw_flow_key *key,
                                      struct sw_flow_actions **acts, bool log)
@@ -94,5 +86,7 @@ static inline int ovs_ct_put_key(const struct sw_flow_key *key,
 }
 
 static inline void ovs_ct_free_action(const struct nlattr *a) { }
+
+#define CT_SUPPORTED_MASK 0
 #endif /* CONFIG_NF_CONNTRACK */
 #endif /* ovs_conntrack.h */
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index a75828091e21..5633172b791a 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -489,9 +489,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 
         if (upcall_info->egress_tun_info) {
                 nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_EGRESS_TUN_KEY);
-                err = ovs_nla_put_egress_tunnel_key(user_skb,
-                                                    upcall_info->egress_tun_info,
-                                                    upcall_info->egress_tun_opts);
+                err = ovs_nla_put_tunnel_info(user_skb,
+                                              upcall_info->egress_tun_info);
                 BUG_ON(err);
                 nla_nest_end(user_skb, nla);
         }
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index f88038a99f44..67bdecd9fdc1 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -117,7 +117,6 @@ struct ovs_skb_cb {
  */
 struct dp_upcall_info {
         struct ip_tunnel_info *egress_tun_info;
-        const void *egress_tun_opts;
         const struct nlattr *userdata;
         const struct nlattr *actions;
         int actions_len;
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 80e1f09397c0..907d6fd28ede 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -764,7 +764,7 @@ static int __ip_tun_to_nlattr(struct sk_buff *skb,
         if ((output->tun_flags & TUNNEL_OAM) &&
             nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_OAM))
                 return -EMSGSIZE;
-        if (tun_opts) {
+        if (swkey_tun_opts_len) {
                 if (output->tun_flags & TUNNEL_GENEVE_OPT &&
                     nla_put(skb, OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,
                             swkey_tun_opts_len, tun_opts))
@@ -798,14 +798,13 @@ static int ip_tun_to_nlattr(struct sk_buff *skb,
         return 0;
 }
 
-int ovs_nla_put_egress_tunnel_key(struct sk_buff *skb,
-                                  const struct ip_tunnel_info *egress_tun_info,
-                                  const void *egress_tun_opts)
+int ovs_nla_put_tunnel_info(struct sk_buff *skb,
+                            struct ip_tunnel_info *tun_info)
 {
-        return __ip_tun_to_nlattr(skb, &egress_tun_info->key,
-                                  egress_tun_opts,
-                                  egress_tun_info->options_len,
-                                  ip_tunnel_info_af(egress_tun_info));
+        return __ip_tun_to_nlattr(skb, &tun_info->key,
+                                  ip_tunnel_info_opts(tun_info),
+                                  tun_info->options_len,
+                                  ip_tunnel_info_af(tun_info));
 }
 
 static int metadata_from_nlattrs(struct net *net, struct sw_flow_match *match,
@@ -866,7 +865,7 @@ static int metadata_from_nlattrs(struct net *net, struct sw_flow_match *match,
             ovs_ct_verify(net, OVS_KEY_ATTR_CT_STATE)) {
                 u32 ct_state = nla_get_u32(a[OVS_KEY_ATTR_CT_STATE]);
 
-                if (!is_mask && !ovs_ct_state_supported(ct_state)) {
+                if (ct_state & ~CT_SUPPORTED_MASK) {
                         OVS_NLERR(log, "ct_state flags %08x unsupported",
                                   ct_state);
                         return -EINVAL;
@@ -1149,6 +1148,9 @@ static void nlattr_set(struct nlattr *attr, u8 val,
                 } else {
                         memset(nla_data(nla), val, nla_len(nla));
                 }
+
+                if (nla_type(nla) == OVS_KEY_ATTR_CT_STATE)
+                        *(u32 *)nla_data(nla) &= CT_SUPPORTED_MASK;
         }
 }
 
@@ -2432,11 +2434,7 @@ static int set_action_to_attr(const struct nlattr *a, struct sk_buff *skb)
                 if (!start)
                         return -EMSGSIZE;
 
-                err = ip_tun_to_nlattr(skb, &tun_info->key,
-                                       tun_info->options_len ?
-                                             ip_tunnel_info_opts(tun_info) : NULL,
-                                       tun_info->options_len,
-                                       ip_tunnel_info_af(tun_info));
+                err = ovs_nla_put_tunnel_info(skb, tun_info);
                 if (err)
                         return err;
                 nla_nest_end(skb, start);
diff --git a/net/openvswitch/flow_netlink.h b/net/openvswitch/flow_netlink.h
index 6ca3f0baf449..47dd142eca1c 100644
--- a/net/openvswitch/flow_netlink.h
+++ b/net/openvswitch/flow_netlink.h
@@ -55,9 +55,9 @@ int ovs_nla_put_mask(const struct sw_flow *flow, struct sk_buff *skb);
 int ovs_nla_get_match(struct net *, struct sw_flow_match *,
                       const struct nlattr *key, const struct nlattr *mask,
                       bool log);
-int ovs_nla_put_egress_tunnel_key(struct sk_buff *,
-                                  const struct ip_tunnel_info *,
-                                  const void *egress_tun_opts);
+
+int ovs_nla_put_tunnel_info(struct sk_buff *skb,
+                            struct ip_tunnel_info *tun_info);
 
 bool ovs_nla_get_ufid(struct sw_flow_id *, const struct nlattr *, bool log);
 int ovs_nla_get_identifier(struct sw_flow_id *sfid, const struct nlattr *ufid,
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 7a568ca8da54..efb736bb6855 100644
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -52,18 +52,6 @@ static int geneve_get_options(const struct vport *vport,
         return 0;
 }
 
-static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                      struct dp_upcall_info *upcall)
-{
-        struct geneve_port *geneve_port = geneve_vport(vport);
-        struct net *net = ovs_dp_get_net(vport->dp);
-        __be16 dport = htons(geneve_port->port_no);
-        __be16 sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true);
-
-        return ovs_tunnel_get_egress_info(upcall, ovs_dp_get_net(vport->dp),
-                                          skb, IPPROTO_UDP, sport, dport);
-}
-
 static struct vport *geneve_tnl_create(const struct vport_parms *parms)
 {
         struct net *net = ovs_dp_get_net(parms->dp);
@@ -130,7 +118,6 @@ static struct vport_ops ovs_geneve_vport_ops = {
         .get_options    = geneve_get_options,
         .send           = dev_queue_xmit,
         .owner          = THIS_MODULE,
-        .get_egress_tun_info    = geneve_get_egress_tun_info,
 };
 
 static int __init ovs_geneve_tnl_init(void)
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index cdb758ab01cf..c3257d78d3d2 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -84,18 +84,10 @@ static struct vport *gre_create(const struct vport_parms *parms)
         return ovs_netdev_link(vport, parms->name);
 }
 
-static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                   struct dp_upcall_info *upcall)
-{
-        return ovs_tunnel_get_egress_info(upcall, ovs_dp_get_net(vport->dp),
-                                          skb, IPPROTO_GRE, 0, 0);
-}
-
 static struct vport_ops ovs_gre_vport_ops = {
         .type           = OVS_VPORT_TYPE_GRE,
         .create         = gre_create,
         .send           = dev_queue_xmit,
-        .get_egress_tun_info    = gre_get_egress_tun_info,
         .destroy        = ovs_netdev_tunnel_destroy,
         .owner          = THIS_MODULE,
 };
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 7f0a8bd08857..ec76398a792f 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -106,12 +106,45 @@ static void internal_dev_destructor(struct net_device *dev)
         free_netdev(dev);
 }
 
+static struct rtnl_link_stats64 *
+internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
+{
+        int i;
+
+        memset(stats, 0, sizeof(*stats));
+        stats->rx_errors  = dev->stats.rx_errors;
+        stats->tx_errors  = dev->stats.tx_errors;
+        stats->tx_dropped = dev->stats.tx_dropped;
+        stats->rx_dropped = dev->stats.rx_dropped;
+
+        for_each_possible_cpu(i) {
+                const struct pcpu_sw_netstats *percpu_stats;
+                struct pcpu_sw_netstats local_stats;
+                unsigned int start;
+
+                percpu_stats = per_cpu_ptr(dev->tstats, i);
+
+                do {
+                        start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
+                        local_stats = *percpu_stats;
+                } while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start));
+
+                stats->rx_bytes         += local_stats.rx_bytes;
+                stats->rx_packets       += local_stats.rx_packets;
+                stats->tx_bytes         += local_stats.tx_bytes;
+                stats->tx_packets       += local_stats.tx_packets;
+        }
+
+        return stats;
+}
+
 static const struct net_device_ops internal_dev_netdev_ops = {
         .ndo_open = internal_dev_open,
         .ndo_stop = internal_dev_stop,
         .ndo_start_xmit = internal_dev_xmit,
         .ndo_set_mac_address = eth_mac_addr,
         .ndo_change_mtu = internal_dev_change_mtu,
+        .ndo_get_stats64 = internal_get_stats,
 };
 
 static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
@@ -161,6 +194,11 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
                 err = -ENOMEM;
                 goto error_free_vport;
         }
+        vport->dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
+        if (!vport->dev->tstats) {
+                err = -ENOMEM;
+                goto error_free_netdev;
+        }
 
         dev_net_set(vport->dev, ovs_dp_get_net(vport->dp));
         internal_dev = internal_dev_priv(vport->dev);
@@ -173,7 +211,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
         rtnl_lock();
         err = register_netdevice(vport->dev);
         if (err)
-                goto error_free_netdev;
+                goto error_unlock;
 
         dev_set_promiscuity(vport->dev, 1);
         rtnl_unlock();
@@ -181,8 +219,10 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
 
         return vport;
 
-error_free_netdev:
+error_unlock:
         rtnl_unlock();
+        free_percpu(vport->dev->tstats);
+error_free_netdev:
         free_netdev(vport->dev);
 error_free_vport:
         ovs_vport_free(vport);
@@ -198,7 +238,7 @@ static void internal_dev_destroy(struct vport *vport)
 
         /* unregister_netdevice() waits for an RCU grace period. */
         unregister_netdevice(vport->dev);
-
+        free_percpu(vport->dev->tstats);
         rtnl_unlock();
 }
 
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index 6f700710d413..1605691d9414 100644
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -146,32 +146,12 @@ static struct vport *vxlan_create(const struct vport_parms *parms)
         return ovs_netdev_link(vport, parms->name);
 }
 
-static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                     struct dp_upcall_info *upcall)
-{
-        struct vxlan_dev *vxlan = netdev_priv(vport->dev);
-        struct net *net = ovs_dp_get_net(vport->dp);
-        unsigned short family = ip_tunnel_info_af(upcall->egress_tun_info);
-        __be16 dst_port = vxlan_dev_dst_port(vxlan, family);
-        __be16 src_port;
-        int port_min;
-        int port_max;
-
-        inet_get_local_port_range(net, &port_min, &port_max);
-        src_port = udp_flow_src_port(net, skb, 0, 0, true);
-
-        return ovs_tunnel_get_egress_info(upcall, net,
-                                          skb, IPPROTO_UDP,
-                                          src_port, dst_port);
-}
-
 static struct vport_ops ovs_vxlan_netdev_vport_ops = {
         .type                   = OVS_VPORT_TYPE_VXLAN,
         .create                 = vxlan_create,
         .destroy                = ovs_netdev_tunnel_destroy,
         .get_options            = vxlan_get_options,
         .send                   = dev_queue_xmit,
-        .get_egress_tun_info    = vxlan_get_egress_tun_info,
 };
 
 static int __init ovs_vxlan_tnl_init(void)
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index ef19d0b77d13..0ac0fd004d7e 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -480,64 +480,6 @@ void ovs_vport_deferred_free(struct vport *vport)
 }
 EXPORT_SYMBOL_GPL(ovs_vport_deferred_free);
 
-int ovs_tunnel_get_egress_info(struct dp_upcall_info *upcall,
-                               struct net *net,
-                               struct sk_buff *skb,
-                               u8 ipproto,
-                               __be16 tp_src,
-                               __be16 tp_dst)
-{
-        struct ip_tunnel_info *egress_tun_info = upcall->egress_tun_info;
-        const struct ip_tunnel_info *tun_info = skb_tunnel_info(skb);
-        const struct ip_tunnel_key *tun_key;
-        u32 skb_mark = skb->mark;
-        struct rtable *rt;
-        struct flowi4 fl;
-
-        if (unlikely(!tun_info))
-                return -EINVAL;
-        if (ip_tunnel_info_af(tun_info) != AF_INET)
-                return -EINVAL;
-
-        tun_key = &tun_info->key;
-
-        /* Route lookup to get srouce IP address.
-         * The process may need to be changed if the corresponding process
-         * in vports ops changed.
-         */
-        rt = ovs_tunnel_route_lookup(net, tun_key, skb_mark, &fl, ipproto);
-        if (IS_ERR(rt))
-                return PTR_ERR(rt);
-
-        ip_rt_put(rt);
-
-        /* Generate egress_tun_info based on tun_info,
-         * saddr, tp_src and tp_dst
-         */
-        ip_tunnel_key_init(&egress_tun_info->key,
-                           fl.saddr, tun_key->u.ipv4.dst,
-                           tun_key->tos,
-                           tun_key->ttl,
-                           tp_src, tp_dst,
-                           tun_key->tun_id,
-                           tun_key->tun_flags);
-        egress_tun_info->options_len = tun_info->options_len;
-        egress_tun_info->mode = tun_info->mode;
-        upcall->egress_tun_opts = ip_tunnel_info_opts(egress_tun_info);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(ovs_tunnel_get_egress_info);
-
-int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                  struct dp_upcall_info *upcall)
-{
-        /* get_egress_tun_info() is only implemented on tunnel ports. */
-        if (unlikely(!vport->ops->get_egress_tun_info))
-                return -EINVAL;
-
-        return vport->ops->get_egress_tun_info(vport, skb, upcall);
-}
-
 static unsigned int packet_length(const struct sk_buff *skb)
 {
         unsigned int length = skb->len - ETH_HLEN;
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 885607f28d56..bdfd82a7c064 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -27,7 +27,6 @@
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/u64_stats_sync.h>
-#include <net/route.h>
 
 #include "datapath.h"
 
@@ -53,16 +52,6 @@ int ovs_vport_set_upcall_portids(struct vport *, const struct nlattr *pids);
 int ovs_vport_get_upcall_portids(const struct vport *, struct sk_buff *);
 u32 ovs_vport_find_upcall_portid(const struct vport *, struct sk_buff *);
 
-int ovs_tunnel_get_egress_info(struct dp_upcall_info *upcall,
-                               struct net *net,
-                               struct sk_buff *,
-                               u8 ipproto,
-                               __be16 tp_src,
-                               __be16 tp_dst);
-
-int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
-                                  struct dp_upcall_info *upcall);
-
 /**
  * struct vport_portids - array of netlink portids of a vport.
  *                        must be protected by rcu.
@@ -140,8 +129,6 @@ struct vport_parms {
  * have any configuration.
  * @send: Send a packet on the device.
  * zero for dropped packets or negative for error.
- * @get_egress_tun_info: Get the egress tunnel 5-tuple and other info for
- * a packet.
  */
 struct vport_ops {
         enum ovs_vport_type type;
@@ -154,9 +141,6 @@ struct vport_ops {
         int (*get_options)(const struct vport *, struct sk_buff *);
 
         netdev_tx_t (*send) (struct sk_buff *skb);
-        int (*get_egress_tun_info)(struct vport *, struct sk_buff *,
-                                   struct dp_upcall_info *upcall);
-
         struct module *owner;
         struct list_head list;
 };