git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netlink-socket: Consistently log sequence numbers in hexadecimal.
[sliver-openvswitch.git]
/
datapath
/
flow.c
diff --git
a/datapath/flow.c
b/datapath/flow.c
index
fb339e7
..
0f73c66
100644
(file)
--- a/
datapath/flow.c
+++ b/
datapath/flow.c
@@
-1,6
+1,6
@@
/*
* Distributed under the terms of the GNU GPL version 2.
/*
* Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010
, 2011
Nicira Networks.
*
* Significant portions of this file may be copied from parts of the Linux
* kernel, by Linus Torvalds and others.
*
* Significant portions of this file may be copied from parts of the Linux
* kernel, by Linus Torvalds and others.
@@
-29,8
+29,6
@@
#include <net/inet_ecn.h>
#include <net/ip.h>
#include <net/inet_ecn.h>
#include <net/ip.h>
-#include "compat.h"
-
static struct kmem_cache *flow_cache;
static unsigned int hash_seed __read_mostly;
static struct kmem_cache *flow_cache;
static unsigned int hash_seed __read_mostly;
@@
-117,7
+115,7
@@
struct sw_flow_actions *flow_actions_alloc(u32 actions_len)
if (actions_len > 2 * DP_MAX_PORTS * nla_total_size(4))
return ERR_PTR(-EINVAL);
if (actions_len > 2 * DP_MAX_PORTS * nla_total_size(4))
return ERR_PTR(-EINVAL);
- sfa = kmalloc(sizeof
*sfa
+ actions_len, GFP_KERNEL);
+ sfa = kmalloc(sizeof
(*sfa)
+ actions_len, GFP_KERNEL);
if (!sfa)
return ERR_PTR(-ENOMEM);
if (!sfa)
return ERR_PTR(-ENOMEM);
@@
-272,7
+270,7
@@
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key,
{
struct ethhdr *eth;
{
struct ethhdr *eth;
- memset(key, 0, sizeof
*key
);
+ memset(key, 0, sizeof
(*key)
);
key->tun_id = OVS_CB(skb)->tun_id;
key->in_port = in_port;
*is_frag = false;
key->tun_id = OVS_CB(skb)->tun_id;
key->in_port = in_port;
*is_frag = false;
@@
-386,7
+384,7
@@
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key,
u32 flow_hash(const struct odp_flow_key *key)
{
u32 flow_hash(const struct odp_flow_key *key)
{
- return jhash2((u32*)key, sizeof
*key
/ sizeof(u32), hash_seed);
+ return jhash2((u32*)key, sizeof
(*key)
/ sizeof(u32), hash_seed);
}
int flow_cmp(const struct tbl_node *node, void *key2_)
}
int flow_cmp(const struct tbl_node *node, void *key2_)
@@
-406,7
+404,7
@@
int flow_init(void)
if (flow_cache == NULL)
return -ENOMEM;
if (flow_cache == NULL)
return -ENOMEM;
- get_random_bytes(&hash_seed, sizeof
hash_seed
);
+ get_random_bytes(&hash_seed, sizeof
(hash_seed)
);
return 0;
}
return 0;
}