diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-26 10:06:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 12:00:49 -0400 |
| commit | 9854518ea04db33738602d45ebc96a200e6f5198 (patch) | |
| tree | 96d3d6f4024f7a79010bea763f5922315d7bd63f /net/sched/act_connmark.c | |
| parent | b676338fb3aab0b63b4a2489feb8f35003db22e8 (diff) | |
| download | op-kernel-dev-9854518ea04db33738602d45ebc96a200e6f5198.zip op-kernel-dev-9854518ea04db33738602d45ebc96a200e6f5198.tar.gz | |
sched: align nlattr properly when needed
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_connmark.c')
| -rw-r--r-- | net/sched/act_connmark.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index c0ed93c..2ba700c 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -163,7 +163,8 @@ static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a, t.install = jiffies_to_clock_t(jiffies - ci->tcf_tm.install); t.lastuse = jiffies_to_clock_t(jiffies - ci->tcf_tm.lastuse); t.expires = jiffies_to_clock_t(ci->tcf_tm.expires); - if (nla_put(skb, TCA_CONNMARK_TM, sizeof(t), &t)) + if (nla_put_64bit(skb, TCA_CONNMARK_TM, sizeof(t), &t, + TCA_CONNMARK_PAD)) goto nla_put_failure; return skb->len; |
