From 87a01d6d5a7b8e6f83ec56cc7637f8edb8d52057 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 21 Mar 2013 20:33:46 +0400 Subject: [PATCH] --- yaml --- r: 361832 b: refs/heads/master c: ae5fc98728c8bbbd6d7cab0b9781671fc4419c1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/packet_diag.h | 4 +++- trunk/include/uapi/linux/unix_diag.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 474b4b6696a1..f8af55f42bbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b37391e68cd8a9cae7d53015627510cc952f4f02 +refs/heads/master: ae5fc98728c8bbbd6d7cab0b9781671fc4419c1b diff --git a/trunk/include/uapi/linux/packet_diag.h b/trunk/include/uapi/linux/packet_diag.h index 93f5fa94a431..afafd703ad92 100644 --- a/trunk/include/uapi/linux/packet_diag.h +++ b/trunk/include/uapi/linux/packet_diag.h @@ -33,9 +33,11 @@ enum { PACKET_DIAG_TX_RING, PACKET_DIAG_FANOUT, - PACKET_DIAG_MAX, + __PACKET_DIAG_MAX, }; +#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1) + struct packet_diag_info { __u32 pdi_index; __u32 pdi_version; diff --git a/trunk/include/uapi/linux/unix_diag.h b/trunk/include/uapi/linux/unix_diag.h index b8a24941db21..b9e2a6a7446f 100644 --- a/trunk/include/uapi/linux/unix_diag.h +++ b/trunk/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;