History

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

David S. Miller committed 11 years ago

Commit 06fb4e72 parents 2573d78 f892a848 files · +47 −15Browse files

Showing the changes to include/uapi (1 of 8 files). Show all

Unified · Split

include/uapi/linux/netlink.h+1−0
@@ -110,6 +110,7 @@ struct nlmsgerr { · 109 unmodified lines
110#define NETLINK_TX_RING 7110#define NETLINK_TX_RING 7
111#define NETLINK_LISTEN_ALL_NSID 8111#define NETLINK_LISTEN_ALL_NSID 8
112#define NETLINK_LIST_MEMBERSHIPS 9112#define NETLINK_LIST_MEMBERSHIPS 9
113#define NETLINK_CAP_ACK 10
113 114
114struct nl_pktinfo {115struct nl_pktinfo {
115 __u32 group;116 __u32 group;