Commit 7085130b authored by Daniele Di Proietto's avatar Daniele Di Proietto Committed by Jesse Gross

openvswitch: use const in some local vars and casts

In few functions, const formal parameters are assigned or cast to
non-const.
These changes suppress warnings if compiled with -Wcast-qual.
Signed-off-by: default avatarDaniele Di Proietto <daniele.di.proietto@gmail.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent a188a54d
...@@ -628,8 +628,10 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, bool *exact_5tuple ...@@ -628,8 +628,10 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, bool *exact_5tuple
if (is_mask && exact_5tuple && *exact_5tuple) { if (is_mask && exact_5tuple && *exact_5tuple) {
if (ipv6_key->ipv6_proto != 0xff || if (ipv6_key->ipv6_proto != 0xff ||
!is_all_set((u8 *)ipv6_key->ipv6_src, sizeof(match->key->ipv6.addr.src)) || !is_all_set((const u8 *)ipv6_key->ipv6_src,
!is_all_set((u8 *)ipv6_key->ipv6_dst, sizeof(match->key->ipv6.addr.dst))) sizeof(match->key->ipv6.addr.src)) ||
!is_all_set((const u8 *)ipv6_key->ipv6_dst,
sizeof(match->key->ipv6.addr.dst)))
*exact_5tuple = false; *exact_5tuple = false;
} }
} }
......
...@@ -57,8 +57,10 @@ static u16 range_n_bytes(const struct sw_flow_key_range *range) ...@@ -57,8 +57,10 @@ static u16 range_n_bytes(const struct sw_flow_key_range *range)
void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src, void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
const struct sw_flow_mask *mask) const struct sw_flow_mask *mask)
{ {
const long *m = (long *)((u8 *)&mask->key + mask->range.start); const long *m = (const long *)((const u8 *)&mask->key +
const long *s = (long *)((u8 *)src + mask->range.start); mask->range.start);
const long *s = (const long *)((const u8 *)src +
mask->range.start);
long *d = (long *)((u8 *)dst + mask->range.start); long *d = (long *)((u8 *)dst + mask->range.start);
int i; int i;
...@@ -375,7 +377,7 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) ...@@ -375,7 +377,7 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table)
static u32 flow_hash(const struct sw_flow_key *key, int key_start, static u32 flow_hash(const struct sw_flow_key *key, int key_start,
int key_end) int key_end)
{ {
u32 *hash_key = (u32 *)((u8 *)key + key_start); const u32 *hash_key = (const u32 *)((const u8 *)key + key_start);
int hash_u32s = (key_end - key_start) >> 2; int hash_u32s = (key_end - key_start) >> 2;
/* Make sure number of hash bytes are multiple of u32. */ /* Make sure number of hash bytes are multiple of u32. */
...@@ -397,8 +399,8 @@ static bool cmp_key(const struct sw_flow_key *key1, ...@@ -397,8 +399,8 @@ static bool cmp_key(const struct sw_flow_key *key1,
const struct sw_flow_key *key2, const struct sw_flow_key *key2,
int key_start, int key_end) int key_start, int key_end)
{ {
const long *cp1 = (long *)((u8 *)key1 + key_start); const long *cp1 = (const long *)((const u8 *)key1 + key_start);
const long *cp2 = (long *)((u8 *)key2 + key_start); const long *cp2 = (const long *)((const u8 *)key2 + key_start);
long diffs = 0; long diffs = 0;
int i; int i;
...@@ -513,8 +515,8 @@ static struct sw_flow_mask *mask_alloc(void) ...@@ -513,8 +515,8 @@ static struct sw_flow_mask *mask_alloc(void)
static bool mask_equal(const struct sw_flow_mask *a, static bool mask_equal(const struct sw_flow_mask *a,
const struct sw_flow_mask *b) const struct sw_flow_mask *b)
{ {
u8 *a_ = (u8 *)&a->key + a->range.start; const u8 *a_ = (const u8 *)&a->key + a->range.start;
u8 *b_ = (u8 *)&b->key + b->range.start; const u8 *b_ = (const u8 *)&b->key + b->range.start;
return (a->range.end == b->range.end) return (a->range.end == b->range.end)
&& (a->range.start == b->range.start) && (a->range.start == b->range.start)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment