Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-08-30 21:45:01 -07:00 · 2015-08-30 21:45:01 -07:00 · 06fb4e701b
commit 06fb4e701b
parent 2573d78872 f892a84cc8
8 changed files with 47 additions and 15 deletions
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@ -110,6 +110,7 @@ struct nlmsgerr {
 #define NETLINK_TX_RING			7
 #define NETLINK_LISTEN_ALL_NSID		8
 #define NETLINK_LIST_MEMBERSHIPS	9
+#define NETLINK_CAP_ACK			10

 struct nl_pktinfo {
 	__u32	group;