projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jsonrpc: Make jsonrpc_error() internal.
[openvswitch]
/
datapath
/
actions.c
diff --git
a/datapath/actions.c
b/datapath/actions.c
index 70fe153af0181bcd3fe05baad6e103aae88018af..4b0760395229d21f9a68818225a7a3b3238adce7 100644
(file)
--- a/
datapath/actions.c
+++ b/
datapath/actions.c
@@
-248,13
+248,13
@@
static int do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
if (unlikely(!skb))
return -ENOMEM;
if (unlikely(!skb))
return -ENOMEM;
- vport =
rcu_dereference(dp->ports[out_port]
);
+ vport =
ovs_vport_rcu(dp, out_port
);
if (unlikely(!vport)) {
kfree_skb(skb);
return -ENODEV;
}
if (unlikely(!vport)) {
kfree_skb(skb);
return -ENODEV;
}
- vport_send(vport, skb);
+
ovs_
vport_send(vport, skb);
return 0;
}
return 0;
}
@@
-283,7
+283,7
@@
static int output_userspace(struct datapath *dp, struct sk_buff *skb,
}
}
}
}
- return dp_upcall(dp, skb, &upcall);
+ return
ovs_
dp_upcall(dp, skb, &upcall);
}
static int sample(struct datapath *dp, struct sk_buff *skb,
}
static int sample(struct datapath *dp, struct sk_buff *skb,
@@
-426,13
+426,13
@@
static int loop_suppress(struct datapath *dp, struct sw_flow_actions *actions)
{
if (net_ratelimit())
pr_warn("%s: flow looped %d times, dropping\n",
{
if (net_ratelimit())
pr_warn("%s: flow looped %d times, dropping\n",
- dp_name(dp), MAX_LOOPS);
+
ovs_
dp_name(dp), MAX_LOOPS);
actions->actions_len = 0;
return -ELOOP;
}
/* Execute a list of actions against 'skb'. */
actions->actions_len = 0;
return -ELOOP;
}
/* Execute a list of actions against 'skb'. */
-int execute_actions(struct datapath *dp, struct sk_buff *skb)
+int
ovs_
execute_actions(struct datapath *dp, struct sk_buff *skb)
{
struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
struct loop_counter *loop;
{
struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
struct loop_counter *loop;