datapath: Always use generic stats for devices (vports)

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

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index eb10903..5beae42 100644 (file)
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -34,17 +34,16 @@ struct gre_base_hdr {
        __be16 protocol;
 };
 
-static int gre_hdr_len(const struct tnl_port_config *port_config)
+static int gre_hdr_len(const struct tnl_mutable_config *mutable)
 {
        int len;
 
        len = GRE_HEADER_SECTION;
 
-       if (port_config->flags & TNL_F_CSUM)
+       if (mutable->flags & TNL_F_CSUM)
                len += GRE_HEADER_SECTION;
 
-       if (port_config->out_key ||
-           port_config->flags & TNL_F_OUT_KEY_ACTION)
+       if (mutable->out_key || mutable->flags & TNL_F_OUT_KEY_ACTION)
                len += GRE_HEADER_SECTION;
 
        return len;
@@ -54,9 +53,9 @@ static int gre_hdr_len(const struct tnl_port_config *port_config)
 static __be32 be64_get_low32(__be64 x)
 {
 #ifdef __BIG_ENDIAN
-       return x;
+       return (__force __be32)x;
 #else
-       return x >> 32;
+       return (__force __be32)((__force u64)x >> 32);
 #endif
 }
 
@@ -70,18 +69,17 @@ static void gre_build_header(const struct vport *vport,
        greh->protocol = htons(ETH_P_TEB);
        greh->flags = 0;
 
-       if (mutable->port_config.flags & TNL_F_CSUM) {
+       if (mutable->flags & TNL_F_CSUM) {
                greh->flags |= GRE_CSUM;
                *options = 0;
                options++;
        }
 
-       if (mutable->port_config.out_key ||
-           mutable->port_config.flags & TNL_F_OUT_KEY_ACTION)
+       if (mutable->out_key || mutable->flags & TNL_F_OUT_KEY_ACTION)
                greh->flags |= GRE_KEY;
 
-       if (mutable->port_config.out_key)
-               *options = be64_get_low32(mutable->port_config.out_key);
+       if (mutable->out_key)
+               *options = be64_get_low32(mutable->out_key);
 }
 
 static struct sk_buff *gre_update_header(const struct vport *vport,
@@ -93,21 +91,24 @@ static struct sk_buff *gre_update_header(const struct vport *vport,
                                               - GRE_HEADER_SECTION);
 
        /* Work backwards over the options so the checksum is last. */
-       if (mutable->port_config.flags & TNL_F_OUT_KEY_ACTION) {
+       if (mutable->flags & TNL_F_OUT_KEY_ACTION) {
                *options = be64_get_low32(OVS_CB(skb)->tun_id);
                options--;
        }
 
-       if (mutable->port_config.flags & TNL_F_CSUM)
+       if (mutable->flags & TNL_F_CSUM)
                *(__sum16 *)options = csum_fold(skb_checksum(skb,
                                                skb_transport_offset(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.
+        * 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);
 
        return skb;
 }
@@ -116,9 +117,9 @@ static struct sk_buff *gre_update_header(const struct vport *vport,
 static __be64 be32_extend_to_be64(__be32 x)
 {
 #ifdef __BIG_ENDIAN
-       return x;
+       return (__force __be64)x;
 #else
-       return (__be64) x << 32;
+       return (__force __be64)((__force u64)x << 32);
 #endif
 }
 
@@ -206,14 +207,14 @@ static void gre_err(struct sk_buff *skb, u32 info)
         * out key as if it were the in key and then check to see if the input
         * and output keys are the same.
         */
-       if (mutable->port_config.in_key != mutable->port_config.out_key)
+       if (mutable->in_key != mutable->out_key)
                return;
 
-       if (!!(mutable->port_config.flags & TNL_F_IN_KEY_MATCH) !=
-           !!(mutable->port_config.flags & TNL_F_OUT_KEY_ACTION))
+       if (!!(mutable->flags & TNL_F_IN_KEY_MATCH) !=
+           !!(mutable->flags & TNL_F_OUT_KEY_ACTION))
                return;
 
-       if ((mutable->port_config.flags & TNL_F_CSUM) && !(flags & GRE_CSUM))
+       if ((mutable->flags & TNL_F_CSUM) && !(flags & GRE_CSUM))
                return;
 
        tunnel_hdr_len += iph->ihl << 2;
@@ -336,7 +337,7 @@ static int gre_rcv(struct sk_buff *skb)
                goto error;
        }
 
-       if (mutable->port_config.flags & TNL_F_IN_KEY_MATCH)
+       if (mutable->flags & TNL_F_IN_KEY_MATCH)
                OVS_CB(skb)->tun_id = key;
        else
                OVS_CB(skb)->tun_id = 0;
@@ -344,7 +345,7 @@ static int gre_rcv(struct sk_buff *skb)
        __skb_pull(skb, hdr_len);
        skb_postpull_rcsum(skb, skb_transport_header(skb), hdr_len + ETH_HLEN);
 
-       tnl_rcv(vport, skb);
+       tnl_rcv(vport, skb, iph->tos);
        return 0;
 
 error:
@@ -387,20 +388,19 @@ static void gre_exit(void)
 }
 
 const struct vport_ops gre_vport_ops = {
-       .type           = "gre",
-       .flags          = VPORT_F_GEN_STATS | VPORT_F_TUN_ID,
+       .type           = OVS_VPORT_TYPE_GRE,
+       .flags          = VPORT_F_TUN_ID,
        .init           = gre_init,
        .exit           = gre_exit,
        .create         = gre_create,
-       .modify         = tnl_modify,
        .destroy        = tnl_destroy,
-       .set_mtu        = tnl_set_mtu,
        .set_addr       = tnl_set_addr,
        .get_name       = tnl_get_name,
        .get_addr       = tnl_get_addr,
+       .get_options    = tnl_get_options,
+       .set_options    = tnl_set_options,
        .get_dev_flags  = vport_gen_get_dev_flags,
        .is_running     = vport_gen_is_running,
        .get_operstate  = vport_gen_get_operstate,
-       .get_mtu        = tnl_get_mtu,
        .send           = tnl_send,
 };