diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 16:06:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 16:06:01 -0700 |
| commit | 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 (patch) | |
| tree | 74a41755d00b908b6e6e31a69ba77774558bf26f /include | |
| parent | 03c6b749b364fe7b8e47ed8e1ce26baca167c322 (diff) | |
| parent | ca9334523c853e407da7b3a0bd02f54d0fa59414 (diff) | |
| download | kernel_samsung_aries-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.zip kernel_samsung_aries-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.tar.gz kernel_samsung_aries-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netlink.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 70c2a9d..6552b71 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 |