projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Improve formatting of bogus empty action attributes.
[openvswitch]
/
datapath
/
actions.c
diff --git
a/datapath/actions.c
b/datapath/actions.c
index 299c16ac261640bcd06aa40f887e4af6625e998f..5e16143ca402f7da0ee8fc18ee5eb16c3b7598e6 100644
(file)
--- a/
datapath/actions.c
+++ b/
datapath/actions.c
@@
-137,7
+137,7
@@
static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
* groups configured). */
if (skb_is_gso(skb)) {
const struct nlattr *actions_left;
* groups configured). */
if (skb_is_gso(skb)) {
const struct nlattr *actions_left;
-
u32
actions_len_left;
+
int
actions_len_left;
struct sk_buff *segs;
segs = skb_gso_segment(skb, 0);
struct sk_buff *segs;
segs = skb_gso_segment(skb, 0);
@@
-150,7
+150,6
@@
static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
do {
struct sk_buff *nskb = segs->next;
do {
struct sk_buff *nskb = segs->next;
- int err;
segs->next = NULL;
segs->next = NULL;
@@
-361,7
+360,7
@@
error:
kfree_skb(skb);
}
kfree_skb(skb);
}
-static int output_control(struct datapath *dp, struct sk_buff *skb, u
32
arg)
+static int output_control(struct datapath *dp, struct sk_buff *skb, u
64
arg)
{
skb = skb_clone(skb, GFP_ATOMIC);
if (!skb)
{
skb = skb_clone(skb, GFP_ATOMIC);
if (!skb)