X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=original%2Fman7%2Fnetlink.7;h=a7c30fcce1e244f2f8d88706c2019f2e1b41273c;hb=4ea6bb24817f6f049d6bbc90ecd77a869876f9b0;hp=7d007f958c26e1f4cd966505194921093724e9fe;hpb=504d22d4a96ccb4837812eca7e370714a5ed57f3;p=linuxjm%2FLDP_man-pages.git

diff --git a/original/man7/netlink.7 b/original/man7/netlink.7
index 7d007f95..a7c30fcc 100644
--- a/original/man7/netlink.7
+++ b/original/man7/netlink.7
@@ -8,7 +8,7 @@
 .\" Based on the original comments from Alexey Kuznetsov
 .\" Modified 2005-12-27 by Hasso Tepper <hasso@estpak.ee>
 .\" $Id: netlink.7,v 1.8 2000/06/22 13:23:00 ak Exp $
-.TH NETLINK  7 2013-03-15 "Linux" "Linux Programmer's Manual"
+.TH NETLINK  7 2015-01-10 "Linux" "Linux Programmer's Manual"
 .SH NAME
 netlink \- communication between kernel and user space (AF_NETLINK)
 .SH SYNOPSIS
@@ -113,6 +113,13 @@ Kernel messages to user space.
 .TP
 .B NETLINK_GENERIC
 Generic netlink family for simplified netlink usage.
+.TP
+.BR NETLINK_CRYPTO " (since Linux 3.2)"
+.\" commit a38f7907b926e4c6c7d389ad96cc38cec2e5a9e9
+.\" Author: Steffen Klassert <steffen.klassert@secunet.com>
+Netlink interface to request information about ciphers registered
+with the kernel crypto API as well as allow configuration of the
+kernel crypto API.
 .PP
 Netlink messages consist of a byte stream with one or multiple
 .I nlmsghdr
@@ -187,10 +194,8 @@ T}
 NLM_F_ACK:Request for an acknowledgment on success.
 NLM_F_ECHO:Echo this request.
 .TE
-.ad
 .sp 1
 .\" No right adjustment for text blocks in tables
-.na
 .TS
 tab(:);
 l s
@@ -202,20 +207,20 @@ NLM_F_MATCH:T{
 Return all entries matching criteria passed in message content.
 Not implemented yet.
 T}
-.\" FIXME NLM_F_ATOMIC is not used any more?
+.\" FIXME NLM_F_ATOMIC is not used anymore?
 NLM_F_ATOMIC:Return an atomic snapshot of the table.
 NLM_F_DUMP:T{
-Convenience macro; equivalent to (NLM_F_ROOT|NLM_F_MATCH).
+Convenience macro; equivalent to
+.br
+(NLM_F_ROOT|NLM_F_MATCH).
 T}
 .TE
-.ad
 .sp 1
 Note that
 .B NLM_F_ATOMIC
 requires the
 .B CAP_NET_ADMIN
 capability or an effective UID of 0.
-.na
 .TS
 tab(:);
 l s
@@ -227,7 +232,6 @@ NLM_F_EXCL:Don't replace if the object already exists.
 NLM_F_CREATE:Create object if it doesn't already exist.
 NLM_F_APPEND:Add to the end of the object list.
 .TE
-.ad
 .sp 1
 .I nlmsg_seq
 and
@@ -416,7 +420,7 @@ bind(fd, (struct sockaddr *) &sa, sizeof(sa));
 
 The next example demonstrates how to send a netlink message to the
 kernel (pid 0).
-Note that application must take care of message sequence numbers
+Note that the application must take care of message sequence numbers
 in order to reliably track acknowledgements.
 
 .in +4n
@@ -482,3 +486,12 @@ information about libnl
 .UE
 
 RFC 3549 "Linux Netlink as an IP Services Protocol"
+.SH COLOPHON
+This page is part of release 3.79 of the Linux
+.I man-pages
+project.
+A description of the project,
+information about reporting bugs,
+and the latest version of this page,
+can be found at
+\%http://www.kernel.org/doc/man\-pages/.