tunneling: Remove struct tnl_vport and tnl_ops.

[sliver-openvswitch.git] / datapath / vport-gre.c

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index c252dcf..0c7ae57 100644 (file)
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -95,8 +95,6 @@ static void __gre_build_header(struct sk_buff *skb,
        __be32 *options = (__be32 *)(skb_network_header(skb) + tunnel_hlen
                        - GRE_HEADER_SECTION);
        struct gre_base_hdr *greh = (struct gre_base_hdr *) skb_transport_header(skb);
-       struct dst_entry *dst = skb_dst(skb);
-
        greh->protocol = htons(ETH_P_TEB);
        greh->flags = 0;
 
@@ -121,14 +119,6 @@ static void __gre_build_header(struct sk_buff *skb,
                                                skb->len - skb_transport_offset(skb),
                                                0));
        }
-       /*
-        * Allow our local IP stack to fragment the outer packet even if the
-        * DF bit is set as a last resort.  We also need to force selection of
-        * an IP ID here because Linux will otherwise leave it at 0 if the
-        * packet originally had DF set.
-        */
-       skb->local_df = 1;
-       __ip_select_ident(ip_hdr(skb), dst, 0);
 }
 
 static void gre_build_header(const struct vport *vport,
@@ -327,12 +317,10 @@ static void gre_exit(void)
        inet_del_protocol(&gre_protocol_handlers, IPPROTO_GRE);
 }
 
-/* GRE vport. */
-static const struct tnl_ops gre_tnl_ops = {
-       .ipproto        = IPPROTO_GRE,
-       .hdr_len        = gre_hdr_len,
-       .build_header   = gre_build_header,
-};
+static const char *gre_get_name(const struct vport *vport)
+{
+       return vport_priv(vport);
+}
 
 static struct vport *gre_create(const struct vport_parms *parms)
 {
@@ -341,11 +329,14 @@ static struct vport *gre_create(const struct vport_parms *parms)
        struct vport *vport;
 
        ovs_net = net_generic(net, ovs_net_id);
-       if (rtnl_dereference(ovs_net->vport_net.gre_vport))
+       if (ovsl_dereference(ovs_net->vport_net.gre_vport))
                return ERR_PTR(-EEXIST);
 
-       vport = ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops);
+       vport = ovs_vport_alloc(IFNAMSIZ, &ovs_gre_vport_ops, parms);
+       if (IS_ERR(vport))
+               return vport;
 
+       strncpy(vport_priv(vport), parms->name, IFNAMSIZ);
        rcu_assign_pointer(ovs_net->vport_net.gre_vport, vport);
        return vport;
 }
@@ -358,7 +349,21 @@ static void gre_tnl_destroy(struct vport *vport)
        ovs_net = net_generic(net, ovs_net_id);
 
        rcu_assign_pointer(ovs_net->vport_net.gre_vport, NULL);
-       ovs_tnl_destroy(vport);
+       ovs_vport_deferred_free(vport);
+}
+
+static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
+{
+       int hlen;
+
+       if (unlikely(!OVS_CB(skb)->tun_key)) {
+               kfree_skb(skb);
+               ovs_vport_record_error(vport, VPORT_E_TX_ERROR);
+               return 0;
+       }
+
+       hlen = gre_hdr_len(OVS_CB(skb)->tun_key);
+       return ovs_tnl_send(vport, skb, IPPROTO_GRE, hlen, gre_build_header);
 }
 
 const struct vport_ops ovs_gre_vport_ops = {
@@ -368,17 +373,11 @@ const struct vport_ops ovs_gre_vport_ops = {
        .exit           = gre_exit,
        .create         = gre_create,
        .destroy        = gre_tnl_destroy,
-       .get_name       = ovs_tnl_get_name,
-       .send           = ovs_tnl_send,
+       .get_name       = gre_get_name,
+       .send           = gre_tnl_send,
 };
 
 /* GRE64 vport. */
-static const struct tnl_ops gre64_tnl_ops = {
-       .ipproto        = IPPROTO_GRE,
-       .hdr_len        = gre64_hdr_len,
-       .build_header   = gre64_build_header,
-};
-
 static struct vport *gre64_create(const struct vport_parms *parms)
 {
        struct net *net = ovs_dp_get_net(parms->dp);
@@ -386,16 +385,18 @@ static struct vport *gre64_create(const struct vport_parms *parms)
        struct vport *vport;
 
        ovs_net = net_generic(net, ovs_net_id);
-       if (rtnl_dereference(ovs_net->vport_net.gre64_vport))
+       if (ovsl_dereference(ovs_net->vport_net.gre64_vport))
                return ERR_PTR(-EEXIST);
 
-       vport = ovs_tnl_create(parms, &ovs_gre64_vport_ops, &gre64_tnl_ops);
+       vport = ovs_vport_alloc(IFNAMSIZ, &ovs_gre64_vport_ops, parms);
+       if (IS_ERR(vport))
+               return vport;
 
+       strncpy(vport_priv(vport), parms->name, IFNAMSIZ);
        rcu_assign_pointer(ovs_net->vport_net.gre64_vport, vport);
        return vport;
 }
 
-
 static void gre64_tnl_destroy(struct vport *vport)
 {
        struct net *net = ovs_dp_get_net(vport->dp);
@@ -404,7 +405,21 @@ static void gre64_tnl_destroy(struct vport *vport)
        ovs_net = net_generic(net, ovs_net_id);
 
        rcu_assign_pointer(ovs_net->vport_net.gre64_vport, NULL);
-       ovs_tnl_destroy(vport);
+       ovs_vport_deferred_free(vport);
+}
+
+static int gre64_tnl_send(struct vport *vport, struct sk_buff *skb)
+{
+       int hlen;
+
+       if (unlikely(!OVS_CB(skb)->tun_key)) {
+               ovs_vport_record_error(vport, VPORT_E_TX_ERROR);
+               kfree_skb(skb);
+               return 0;
+       }
+
+       hlen = gre64_hdr_len(OVS_CB(skb)->tun_key);
+       return ovs_tnl_send(vport, skb, IPPROTO_GRE, hlen, gre64_build_header);
 }
 
 const struct vport_ops ovs_gre64_vport_ops = {
@@ -414,6 +429,6 @@ const struct vport_ops ovs_gre64_vport_ops = {
        .exit           = gre_exit,
        .create         = gre64_create,
        .destroy        = gre64_tnl_destroy,
-       .get_name       = ovs_tnl_get_name,
-       .send           = ovs_tnl_send,
+       .get_name       = gre_get_name,
+       .send           = gre64_tnl_send,
 };