summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ada3428)
The Open vSwitch C style doesn't use hard tabs.
This commit doesn't touch files written in kernel style or that are
imported from other projects where we want to minimize changes from
upstream (the sflow files).
Reported-by: Mehak Mahajan <mmahajan@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
* boundary. */
typedef struct {
#ifdef WORDS_BIGENDIAN
* boundary. */
typedef struct {
#ifdef WORDS_BIGENDIAN
#endif
} ovs_32aligned_u64;
/* A 64-bit value, in network byte order, that is only aligned on a 32-bit
* boundary. */
typedef struct {
#endif
} ovs_32aligned_u64;
/* A 64-bit value, in network byte order, that is only aligned on a 32-bit
* boundary. */
typedef struct {
} ovs_32aligned_be64;
#endif /* openvswitch/types.h */
} ovs_32aligned_be64;
#endif /* openvswitch/types.h */
/* These were introduced all together in 2.6.24. */
#ifndef NLA_TYPE_MASK
/* These were introduced all together in 2.6.24. */
#ifndef NLA_TYPE_MASK
-#define NLA_F_NESTED (1 << 15)
-#define NLA_F_NET_BYTEORDER (1 << 14)
-#define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
+#define NLA_F_NESTED (1 << 15)
+#define NLA_F_NET_BYTEORDER (1 << 14)
+#define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
#endif
/* These were introduced all together in 2.6.14. (We want our programs to
#endif
/* These were introduced all together in 2.6.14. (We want our programs to
#define CTRL_ATTR_MCAST_GROUPS 7
enum {
#define CTRL_ATTR_MCAST_GROUPS 7
enum {
- CTRL_ATTR_MCAST_GRP_UNSPEC,
- CTRL_ATTR_MCAST_GRP_NAME,
- CTRL_ATTR_MCAST_GRP_ID,
- __CTRL_ATTR_MCAST_GRP_MAX,
+ CTRL_ATTR_MCAST_GRP_UNSPEC,
+ CTRL_ATTR_MCAST_GRP_NAME,
+ CTRL_ATTR_MCAST_GRP_ID,
+ __CTRL_ATTR_MCAST_GRP_MAX,
};
#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
};
#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
/* This software also makes use of the following component:
*
* NIST Secure Hash Algorithm
/* This software also makes use of the following component:
*
* NIST Secure Hash Algorithm
- * heavily modified by Uwe Hollerbach uh@alumni.caltech edu
- * from Peter C. Gutmann's implementation as found in
- * Applied Cryptography by Bruce Schneier
- * This code is hereby placed in the public domain
+ * heavily modified by Uwe Hollerbach uh@alumni.caltech edu
+ * from Peter C. Gutmann's implementation as found in
+ * Applied Cryptography by Bruce Schneier
+ * This code is hereby placed in the public domain
-#define CONST1 0x5a827999L
-#define CONST2 0x6ed9eba1L
-#define CONST3 0x8f1bbcdcL
-#define CONST4 0xca62c1d6L
+#define CONST1 0x5a827999L
+#define CONST2 0x6ed9eba1L
+#define CONST3 0x8f1bbcdcL
+#define CONST4 0xca62c1d6L
/* 32-bit rotate */
static inline uint32_t
/* 32-bit rotate */
static inline uint32_t
int i;
uint8_t ct[4], *cp;
int i;
uint8_t ct[4], *cp;
- count /= sizeof(uint32_t);
- cp = (uint8_t *) buffer;
- for (i = 0; i < count; i++) {
- ct[0] = cp[0];
- ct[1] = cp[1];
- ct[2] = cp[2];
- ct[3] = cp[3];
- cp[0] = ct[3];
- cp[1] = ct[2];
- cp[2] = ct[1];
- cp[3] = ct[0];
- cp += sizeof(uint32_t);
- }
+ count /= sizeof(uint32_t);
+ cp = (uint8_t *) buffer;
+ for (i = 0; i < count; i++) {
+ ct[0] = cp[0];
+ ct[1] = cp[1];
+ ct[2] = cp[2];
+ ct[3] = cp[3];
+ cp[0] = ct[3];
+ cp[1] = ct[2];
+ cp[2] = ct[1];
+ cp[3] = ct[0];
+ cp += sizeof(uint32_t);
+ }
* limitations under the License.
*/
/* NIST Secure Hash Algorithm
* limitations under the License.
*/
/* NIST Secure Hash Algorithm
- * heavily modified by Uwe Hollerbach uh@alumni.caltech edu
- * from Peter C. Gutmann's implementation as found in
- * Applied Cryptography by Bruce Schneier
- * This code is hereby placed in the public domain
+ * heavily modified by Uwe Hollerbach uh@alumni.caltech edu
+ * from Peter C. Gutmann's implementation as found in
+ * Applied Cryptography by Bruce Schneier
+ * This code is hereby placed in the public domain
static inline uint64_t
get_32aligned_u64(const ovs_32aligned_u64 *x)
{
static inline uint64_t
get_32aligned_u64(const ovs_32aligned_u64 *x)
{
- return ((uint64_t) x->hi << 32) | x->lo;
+ return ((uint64_t) x->hi << 32) | x->lo;
}
/* Stores 'value' in 'x'. */
static inline void
put_32aligned_u64(ovs_32aligned_u64 *x, uint64_t value)
{
}
/* Stores 'value' in 'x'. */
static inline void
put_32aligned_u64(ovs_32aligned_u64 *x, uint64_t value)
{
- x->hi = value >> 32;
- x->lo = value;
+ x->hi = value >> 32;
+ x->lo = value;
get_32aligned_be64(const ovs_32aligned_be64 *x)
{
#ifdef WORDS_BIGENDIAN
get_32aligned_be64(const ovs_32aligned_be64 *x)
{
#ifdef WORDS_BIGENDIAN
- return ((ovs_be64) x->hi << 32) | x->lo;
+ return ((ovs_be64) x->hi << 32) | x->lo;
- return ((ovs_be64) x->lo << 32) | x->hi;
+ return ((ovs_be64) x->lo << 32) | x->hi;
put_32aligned_be64(ovs_32aligned_be64 *x, ovs_be64 value)
{
#if WORDS_BIGENDIAN
put_32aligned_be64(ovs_32aligned_be64 *x, ovs_be64 value)
{
#if WORDS_BIGENDIAN
- x->hi = value >> 32;
- x->lo = value;
+ x->hi = value >> 32;
+ x->lo = value;
#else
x->hi = value;
x->lo = value >> 32;
#else
x->hi = value;
x->lo = value >> 32;
}
}
ofconn_set_invalid_ttl_to_controller(ofconn,
}
}
ofconn_set_invalid_ttl_to_controller(ofconn,
- (flags & OFPC_INVALID_TTL_TO_CONTROLLER));
+ (flags & OFPC_INVALID_TTL_TO_CONTROLLER));
ofconn_set_miss_send_len(ofconn, ntohs(osc->miss_send_len));
ofconn_set_miss_send_len(ofconn, ntohs(osc->miss_send_len));
: (ofproto_port_dump_done(DUMP), false)); \
)
: (ofproto_port_dump_done(DUMP), false)); \
)
-#define OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT 1000
-#define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100
+#define OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT 1000
+#define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100
int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp);
int ofproto_port_del(struct ofproto *, uint16_t ofp_port);
int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp);
int ofproto_port_del(struct ofproto *, uint16_t ofp_port);