summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-04-27 15:01:07 (GMT)
committerThomas Haller <thaller@redhat.com>2015-05-05 14:04:57 (GMT)
commit6af196f03f245e06945f123ac49777c8d20e4cef (patch)
tree1eeea406c3e5406883f38313d928baf4bf92ccd4 /lib
parent8f5c65beee10598eb3264494963773e7b44a85e5 (diff)
downloadlibnl-6af196f03f245e06945f123ac49777c8d20e4cef.zip
libnl-6af196f03f245e06945f123ac49777c8d20e4cef.tar.gz
libnl-6af196f03f245e06945f123ac49777c8d20e4cef.tar.bz2
utils: Add translations for NETLINK_RDMA and NETLINK_CRYPTO
Add translations for NETLINK_RDMA and NETLINK_CRYPTO to nlfamilies, allowing to use nl_nlfamily2str() and nl_str2nlfamily() for these families. This makes it necessary to update the private copy of linux/netlink.h and also includes the rename of NETLINK_INET_DIAG to NETLINK_SOCK_DIAG in upstream commit 7f1fb60c4fc9fb29 ("inet_diag: Partly rename inet_ to sock_") and the removal of the duplicate NLMSG_ALIGN in the NLMSG_LENGTH() macro in upstream commit a88b9ce5ad4fc633 ("netlink: remove duplicated NLMSG_ALIGN"). http://lists.infradead.org/pipermail/libnl/2015-April/001868.html Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/utils.c b/lib/utils.c
index 68ea762..ca11fea 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -603,6 +603,8 @@ static const struct trans_tbl nlfamilies[] = {
__ADD(NETLINK_GENERIC,generic),
__ADD(NETLINK_SCSITRANSPORT,scsitransport),
__ADD(NETLINK_ECRYPTFS,ecryptfs),
+ __ADD(NETLINK_RDMA,rdma),
+ __ADD(NETLINK_CRYPTO,crypto),
};
char * nl_nlfamily2str(int family, char *buf, size_t size)