/*
- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
typedef __be32 ovs_be32;
typedef __be64 ovs_be64;
\f
-/* Netlink and OpenFlow both contain 64-bit values that are only guaranteed to
- * be aligned on 32-bit boundaries. These types help.
+/* These types help with a few funny situations:
+ *
+ * - The Ethernet header is 14 bytes long, which misaligns everything after
+ * that. One can put 2 "shim" bytes before the Ethernet header, but this
+ * helps only if there is exactly one Ethernet header. If there are two,
+ * as with GRE and VXLAN (and if the inner header doesn't use this
+ * trick--GRE and VXLAN don't) then you have the choice of aligning the
+ * inner data or the outer data. So it seems better to treat 32-bit fields
+ * in protocol headers as aligned only on 16-bit boundaries.
+ *
+ * - ARP headers contain misaligned 32-bit fields.
+ *
+ * - Netlink and OpenFlow contain 64-bit values that are only guaranteed to
+ * be aligned on 32-bit boundaries.
*
* lib/unaligned.h has helper functions for accessing these. */
+/* A 32-bit value, in host byte order, that is only aligned on a 16-bit
+ * boundary. */
+typedef struct {
+#ifdef WORDS_BIGENDIAN
+ uint16_t hi, lo;
+#else
+ uint16_t lo, hi;
+#endif
+} ovs_16aligned_u32;
+
+/* A 32-bit value, in network byte order, that is only aligned on a 16-bit
+ * boundary. */
+typedef struct {
+ ovs_be16 hi, lo;
+} ovs_16aligned_be32;
+
/* A 64-bit value, in host byte order, that is only aligned on a 32-bit
* boundary. */
typedef struct {
ovs_be32 hi, lo;
} ovs_32aligned_be64;
+/* ofp_port_t represents the port number of a OpenFlow switch.
+ * odp_port_t represents the port number on the datapath.
+ * ofp11_port_t represents the OpenFlow-1.1 port number. */
+typedef uint16_t OVS_BITWISE ofp_port_t;
+typedef uint32_t OVS_BITWISE odp_port_t;
+typedef uint32_t OVS_BITWISE ofp11_port_t;
+
+/* Macro functions that cast int types to ofp/odp/ofp11 types. */
+#define OFP_PORT_C(X) ((OVS_FORCE ofp_port_t) (X))
+#define ODP_PORT_C(X) ((OVS_FORCE odp_port_t) (X))
+#define OFP11_PORT_C(X) ((OVS_FORCE ofp11_port_t) (X))
+
#endif /* openvswitch/types.h */