diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-22 11:31:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-23 20:13:24 -0400 |
commit | 2175d87cc3561c02e605bc8ac81ee5d875a51b9e (patch) | |
tree | 4716918fa0dc60b699cadb80ba2e143a1cd9081c /net/ipv4/tcp_metrics.c | |
parent | 756a2f59b73cd6ed8afae3f6e8efb3fb829e4600 (diff) |
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/ipv4/tcp_metrics.c')
-rw-r--r-- | net/ipv4/tcp_metrics.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 7b7eec439906..b617826e2477 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c | |||
@@ -800,7 +800,8 @@ static int tcp_metrics_fill_info(struct sk_buff *msg, | |||
800 | } | 800 | } |
801 | 801 | ||
802 | if (nla_put_msecs(msg, TCP_METRICS_ATTR_AGE, | 802 | if (nla_put_msecs(msg, TCP_METRICS_ATTR_AGE, |
803 | jiffies - tm->tcpm_stamp) < 0) | 803 | jiffies - tm->tcpm_stamp, |
804 | TCP_METRICS_ATTR_PAD) < 0) | ||
804 | goto nla_put_failure; | 805 | goto nla_put_failure; |
805 | if (tm->tcpm_ts_stamp) { | 806 | if (tm->tcpm_ts_stamp) { |
806 | if (nla_put_s32(msg, TCP_METRICS_ATTR_TW_TS_STAMP, | 807 | if (nla_put_s32(msg, TCP_METRICS_ATTR_TW_TS_STAMP, |
@@ -864,7 +865,8 @@ static int tcp_metrics_fill_info(struct sk_buff *msg, | |||
864 | (nla_put_u16(msg, TCP_METRICS_ATTR_FOPEN_SYN_DROPS, | 865 | (nla_put_u16(msg, TCP_METRICS_ATTR_FOPEN_SYN_DROPS, |
865 | tfom->syn_loss) < 0 || | 866 | tfom->syn_loss) < 0 || |
866 | nla_put_msecs(msg, TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS, | 867 | nla_put_msecs(msg, TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS, |
867 | jiffies - tfom->last_syn_loss) < 0)) | 868 | jiffies - tfom->last_syn_loss, |
869 | TCP_METRICS_ATTR_PAD) < 0)) | ||
868 | goto nla_put_failure; | 870 | goto nla_put_failure; |
869 | if (tfom->cookie.len > 0 && | 871 | if (tfom->cookie.len > 0 && |
870 | nla_put(msg, TCP_METRICS_ATTR_FOPEN_COOKIE, | 872 | nla_put(msg, TCP_METRICS_ATTR_FOPEN_COOKIE, |