summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 01:06:01 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 01:06:01 +0200
commit92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 (patch)
tree74a41755d00b908b6e6e31a69ba77774558bf26f /include
parent[PATCH] x86_64: add MODULE_ALIAS for aes (diff)
parent[IPV4]: Debug cleanup (diff)
downloadlinux-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.tar.xz
linux-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/netlink.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 70c2a9dc4b2b..6552b71bfa73 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -12,15 +12,13 @@
#define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */
#define NETLINK_XFRM 6 /* ipsec */
#define NETLINK_SELINUX 7 /* SELinux event notifications */
-#define NETLINK_ARPD 8
+#define NETLINK_ISCSI 8 /* Open-iSCSI */
#define NETLINK_AUDIT 9 /* auditing */
#define NETLINK_FIB_LOOKUP 10
-#define NETLINK_ROUTE6 11 /* af_inet6 route comm channel */
#define NETLINK_NETFILTER 12 /* netfilter subsystem */
#define NETLINK_IP6_FW 13
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
-#define NETLINK_TAPBASE 16 /* 16 to 31 are ethertap */
#define MAX_LINKS 32