diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /include/uapi/linux/netlink_diag.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/netlink_diag.h')
| -rw-r--r-- | include/uapi/linux/netlink_diag.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netlink_diag.h b/include/uapi/linux/netlink_diag.h index 4e31db4eea41..f2159d30d1f5 100644 --- a/include/uapi/linux/netlink_diag.h +++ b/include/uapi/linux/netlink_diag.h | |||
| @@ -33,6 +33,7 @@ struct netlink_diag_ring { | |||
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | enum { | 35 | enum { |
| 36 | /* NETLINK_DIAG_NONE, standard nl API requires this attribute! */ | ||
| 36 | NETLINK_DIAG_MEMINFO, | 37 | NETLINK_DIAG_MEMINFO, |
| 37 | NETLINK_DIAG_GROUPS, | 38 | NETLINK_DIAG_GROUPS, |
| 38 | NETLINK_DIAG_RX_RING, | 39 | NETLINK_DIAG_RX_RING, |