History

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.

Nicolas Dichtel committed 10 years ago

Commit 6ed46d11 parent 3c6f3714 files · +13 −7Browse files

Showing the changes to include/uapi (1 of 4 files). Show all

Unified · Split

include/uapi/linux/inet_diag.h+3−1
@@ -115,9 +115,11 @@ enum { · 114 unmodified lines
115 INET_DIAG_SKV6ONLY,115 INET_DIAG_SKV6ONLY,
116 INET_DIAG_LOCALS,116 INET_DIAG_LOCALS,
117 INET_DIAG_PEERS,117 INET_DIAG_PEERS,
118 INET_DIAG_PAD,
119 __INET_DIAG_MAX,
118};120};
119 121
120#define INET_DIAG_MAX INET_DIAG_SKV6ONLY122#define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
121 123
122/* INET_DIAG_MEM */124/* INET_DIAG_MEM */
123 125