diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-26 11:06:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 19:00:48 +0300 |
| commit | 6ed46d1247a595c58b6c04481fa77cf532f45de0 (patch) | |
| tree | 16ff8cec378c83d80cb395c152af472fa9fdb3de /include | |
| parent | 3c6f3714d6a9e051eb84759e4fa5a2f4a3e730c6 (diff) | |
| download | linux-6ed46d1247a595c58b6c04481fa77cf532f45de0.tar.xz | |
sock_diag: align nlattr properly when needed
I also fix the value of INET_DIAG_MAX. It's wrong since commit 8f840e47f190
which is only in net-next right now, thus I didn't make a separate patch.
Fixes: 8f840e47f190 ("sctp: add the sctp_diag.c file")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/inet_diag.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h index f5f3629dd553..a16643705669 100644 --- a/include/uapi/linux/inet_diag.h +++ b/include/uapi/linux/inet_diag.h @@ -115,9 +115,11 @@ enum { INET_DIAG_SKV6ONLY, INET_DIAG_LOCALS, INET_DIAG_PEERS, + INET_DIAG_PAD, + __INET_DIAG_MAX, }; -#define INET_DIAG_MAX INET_DIAG_SKV6ONLY +#define INET_DIAG_MAX (__INET_DIAG_MAX - 1) /* INET_DIAG_MEM */ |