projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: openvswitch: fix TTL decrement action netlink message format
[linux-2.6-microblaze.git]
/
net
/
openvswitch
/
actions.c
diff --git
a/net/openvswitch/actions.c
b/net/openvswitch/actions.c
index
b87bfc8
..
5829a02
100644
(file)
--- a/
net/openvswitch/actions.c
+++ b/
net/openvswitch/actions.c
@@
-958,14
+958,13
@@
static int dec_ttl_exception_handler(struct datapath *dp, struct sk_buff *skb,
{
/* The first action is always 'OVS_DEC_TTL_ATTR_ARG'. */
struct nlattr *dec_ttl_arg = nla_data(attr);
{
/* The first action is always 'OVS_DEC_TTL_ATTR_ARG'. */
struct nlattr *dec_ttl_arg = nla_data(attr);
- int rem = nla_len(attr);
if (nla_len(dec_ttl_arg)) {
if (nla_len(dec_ttl_arg)) {
- struct nlattr *actions = nla_
next(dec_ttl_arg, &rem
);
+ struct nlattr *actions = nla_
data(dec_ttl_arg
);
if (actions)
if (actions)
- return clone_execute(dp, skb, key, 0,
actions, rem
,
- last, false);
+ return clone_execute(dp, skb, key, 0,
nla_data(actions)
,
+
nla_len(actions),
last, false);
}
consume_skb(skb);
return 0;
}
consume_skb(skb);
return 0;