diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /include/linux/netlink.h | |
parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/netlink.h')
-rw-r--r-- | include/linux/netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 167518668936..7bbd25970c9e 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #define NETLINK_ISCSI 8 /* Open-iSCSI */ | 15 | #define NETLINK_ISCSI 8 /* Open-iSCSI */ |
16 | #define NETLINK_AUDIT 9 /* auditing */ | 16 | #define NETLINK_AUDIT 9 /* auditing */ |
17 | #define NETLINK_FIB_LOOKUP 10 | 17 | #define NETLINK_FIB_LOOKUP 10 |
18 | #define NETLINK_CONNECTOR 11 | ||
18 | #define NETLINK_NETFILTER 12 /* netfilter subsystem */ | 19 | #define NETLINK_NETFILTER 12 /* netfilter subsystem */ |
19 | #define NETLINK_IP6_FW 13 | 20 | #define NETLINK_IP6_FW 13 |
20 | #define NETLINK_DNRTMSG 14 /* DECnet routing messages */ | 21 | #define NETLINK_DNRTMSG 14 /* DECnet routing messages */ |