projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Allow table to expand to have TBL_MAX_BUCKETS buckets
[openvswitch]
/
datapath
/
datapath.c
diff --git
a/datapath/datapath.c
b/datapath/datapath.c
index d1493445721ce3a40109b5923744a935e8666731..a964c27f469e3618d854f47ff9da9068c40ea900 100644
(file)
--- a/
datapath/datapath.c
+++ b/
datapath/datapath.c
@@
-84,7
+84,7
@@
EXPORT_SYMBOL(dp_ioctl_hook);
static LIST_HEAD(dps);
static struct vport *new_vport(const struct vport_parms *);
static LIST_HEAD(dps);
static struct vport *new_vport(const struct vport_parms *);
-static int queue_
control
_packets(struct datapath *, struct sk_buff *,
+static int queue_
userspace
_packets(struct datapath *, struct sk_buff *,
const struct dp_upcall_info *);
/* Must be called with rcu_read_lock, genl_mutex, or RTNL lock. */
const struct dp_upcall_info *);
/* Must be called with rcu_read_lock, genl_mutex, or RTNL lock. */
@@
-415,7
+415,7
@@
int dp_upcall(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_i
skb = nskb;
}
skb = nskb;
}
- err = queue_
control
_packets(dp, skb, upcall_info);
+ err = queue_
userspace
_packets(dp, skb, upcall_info);
if (err)
goto err;
if (err)
goto err;
@@
-438,7
+438,7
@@
err:
* 'upcall_info'. There will be only one packet unless we broke up a GSO
* packet.
*/
* 'upcall_info'. There will be only one packet unless we broke up a GSO
* packet.
*/
-static int queue_
control
_packets(struct datapath *dp, struct sk_buff *skb,
+static int queue_
userspace
_packets(struct datapath *dp, struct sk_buff *skb,
const struct dp_upcall_info *upcall_info)
{
u32 group = packet_mc_group(dp, upcall_info->cmd);
const struct dp_upcall_info *upcall_info)
{
u32 group = packet_mc_group(dp, upcall_info->cmd);
@@
-552,7
+552,7
@@
static int validate_actions(const struct nlattr *attr)
nla_for_each_nested(a, attr, rem) {
static const u32 action_lens[ODP_ACTION_ATTR_MAX + 1] = {
[ODP_ACTION_ATTR_OUTPUT] = 4,
nla_for_each_nested(a, attr, rem) {
static const u32 action_lens[ODP_ACTION_ATTR_MAX + 1] = {
[ODP_ACTION_ATTR_OUTPUT] = 4,
- [ODP_ACTION_ATTR_
CONTROLLER
] = 8,
+ [ODP_ACTION_ATTR_
USERSPACE
] = 8,
[ODP_ACTION_ATTR_SET_DL_TCI] = 2,
[ODP_ACTION_ATTR_STRIP_VLAN] = 0,
[ODP_ACTION_ATTR_SET_DL_SRC] = ETH_ALEN,
[ODP_ACTION_ATTR_SET_DL_TCI] = 2,
[ODP_ACTION_ATTR_STRIP_VLAN] = 0,
[ODP_ACTION_ATTR_SET_DL_SRC] = ETH_ALEN,
@@
-575,7
+575,7
@@
static int validate_actions(const struct nlattr *attr)
case ODP_ACTION_ATTR_UNSPEC:
return -EINVAL;
case ODP_ACTION_ATTR_UNSPEC:
return -EINVAL;
- case ODP_ACTION_ATTR_
CONTROLLER
:
+ case ODP_ACTION_ATTR_
USERSPACE
:
case ODP_ACTION_ATTR_STRIP_VLAN:
case ODP_ACTION_ATTR_SET_DL_SRC:
case ODP_ACTION_ATTR_SET_DL_DST:
case ODP_ACTION_ATTR_STRIP_VLAN:
case ODP_ACTION_ATTR_SET_DL_SRC:
case ODP_ACTION_ATTR_SET_DL_DST: