diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-22 17:31:21 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-23 20:13:24 -0400 |
| commit | 2175d87cc3561c02e605bc8ac81ee5d875a51b9e (patch) | |
| tree | 4716918fa0dc60b699cadb80ba2e143a1cd9081c /net/l2tp | |
| parent | libnl: nla_put_s64(): align on a 64-bit area (diff) | |
| download | linux-dev-2175d87cc3561c02e605bc8ac81ee5d875a51b9e.tar.xz linux-dev-2175d87cc3561c02e605bc8ac81ee5d875a51b9e.zip | |
libnl: nla_put_msecs(): align on a 64-bit area
nla_data() is now aligned on a 64-bit area.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_netlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 2caaa84ce92d..24ed2e875c45 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -746,7 +746,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl nla_put_u8(skb, L2TP_ATTR_USING_IPSEC, 1)) || #endif (session->reorder_timeout && - nla_put_msecs(skb, L2TP_ATTR_RECV_TIMEOUT, session->reorder_timeout))) + nla_put_msecs(skb, L2TP_ATTR_RECV_TIMEOUT, + session->reorder_timeout, L2TP_ATTR_PAD))) goto nla_put_failure; nest = nla_nest_start(skb, L2TP_ATTR_STATS); |