diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-31 00:45:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-31 00:45:01 -0400 |
| commit | 06fb4e701b17e93366542e4cc57047e411136af7 (patch) | |
| tree | e68d4bce91bf3fa82f6a76c424d1d18d222d6638 /include/uapi/linux | |
| parent | 2573d78872f242a05b842e9c553da45a3d9924e5 (diff) | |
| parent | f892a84cc890aaaba7bc42daf2e2ee86b0961884 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index cf6a65cccbdf..6f3fe16cd22a 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h | |||
| @@ -110,6 +110,7 @@ struct nlmsgerr { | |||
| 110 | #define NETLINK_TX_RING 7 | 110 | #define NETLINK_TX_RING 7 |
| 111 | #define NETLINK_LISTEN_ALL_NSID 8 | 111 | #define NETLINK_LISTEN_ALL_NSID 8 |
| 112 | #define NETLINK_LIST_MEMBERSHIPS 9 | 112 | #define NETLINK_LIST_MEMBERSHIPS 9 |
| 113 | #define NETLINK_CAP_ACK 10 | ||
| 113 | 114 | ||
| 114 | struct nl_pktinfo { | 115 | struct nl_pktinfo { |
| 115 | __u32 group; | 116 | __u32 group; |