diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-22 12:53:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-22 12:53:09 -0400 |
| commit | ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06 (patch) | |
| tree | a5b4cd52ec5e27d169bf3115d732d2106bc78fc2 /include/uapi/linux/unix_diag.h | |
| parent | 2fa70df935585479f974766d84fa68af462a25a5 (diff) | |
| parent | f4541d60a449afd40448b06496dcd510f505928e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull to get the thermal netlink multicast group name fix, otherwise
the assertion added in net-next to netlink to detect that kind of bug
makes systems unbootable for some folks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/unix_diag.h')
| -rw-r--r-- | include/uapi/linux/unix_diag.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/unix_diag.h b/include/uapi/linux/unix_diag.h index b8a24941db21..b9e2a6a7446f 100644 --- a/include/uapi/linux/unix_diag.h +++ b/include/uapi/linux/unix_diag.h @@ -39,9 +39,11 @@ enum { UNIX_DIAG_MEMINFO, UNIX_DIAG_SHUTDOWN, - UNIX_DIAG_MAX, + __UNIX_DIAG_MAX, }; +#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1) + struct unix_diag_vfs { __u32 udiag_vfs_ino; __u32 udiag_vfs_dev; |