From c2c0007346358a44995443dac47b018e0a452cd2 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 28 Jul 2004 04:48:20 -0700 Subject: [NET]: Kill rtnl_exlock stubs. Rtnetlink has some macro's that are relics from earlier locking. They are only used a couple of places so are easy to kill. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- include/linux/rtnetlink.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/linux') diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 4f949964bb9b..58c6429ccdf7 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -746,10 +746,6 @@ extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); extern struct semaphore rtnl_sem; -#define rtnl_exlock() do { } while(0) -#define rtnl_exunlock() do { } while(0) -#define rtnl_exlock_nowait() (0) - #define rtnl_shlock() down(&rtnl_sem) #define rtnl_shlock_nowait() down_trylock(&rtnl_sem) -- cgit v1.2.3 From c18f65d787671616f56f720b1e0c359d88593155 Mon Sep 17 00:00:00 2001 From: Hideaki Yoshifuji Date: Thu, 29 Jul 2004 20:04:10 +0900 Subject: [IPV6] fix the order of icmpv6 definitions for consistency. Signed-off-by: Hideaki YOSHIFUJI --- include/linux/icmpv6.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'include/linux') diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 6b2bf70d2417..ed8f6848f48c 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -85,18 +85,7 @@ struct icmp6hdr { #define ICMPV6_MGM_QUERY 130 #define ICMPV6_MGM_REPORT 131 #define ICMPV6_MGM_REDUCTION 132 - -/* definitions for MLDv2 */ - -#define MLD2_MODE_IS_INCLUDE 1 -#define MLD2_MODE_IS_EXCLUDE 2 -#define MLD2_CHANGE_TO_INCLUDE 3 -#define MLD2_CHANGE_TO_EXCLUDE 4 -#define MLD2_ALLOW_NEW_SOURCES 5 -#define MLD2_BLOCK_OLD_SOURCES 6 - #define ICMPV6_MLD2_REPORT 143 -#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } } /* * Codes for Destination Unreachable @@ -139,6 +128,18 @@ struct icmp6_filter { __u32 data[8]; }; +/* + * Definitions for MLDv2 + */ +#define MLD2_MODE_IS_INCLUDE 1 +#define MLD2_MODE_IS_EXCLUDE 2 +#define MLD2_CHANGE_TO_INCLUDE 3 +#define MLD2_CHANGE_TO_EXCLUDE 4 +#define MLD2_ALLOW_NEW_SOURCES 5 +#define MLD2_BLOCK_OLD_SOURCES 6 + +#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } } + #ifdef __KERNEL__ #include -- cgit v1.2.3 From 94829b2cbe8b84f403306ee909418d9112cff832 Mon Sep 17 00:00:00 2001 From: Hideaki Yoshifuji Date: Thu, 29 Jul 2004 20:07:10 +0900 Subject: [IPV6] add missing known icmpv6 types. Signed-off-by: Hideaki YOSHIFUJI --- include/linux/icmpv6.h | 9 +++++++++ net/ipv6/icmp.c | 6 ++++++ 2 files changed, 15 insertions(+) (limited to 'include/linux') diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index ed8f6848f48c..0cf6c8b12caf 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -85,8 +85,17 @@ struct icmp6hdr { #define ICMPV6_MGM_QUERY 130 #define ICMPV6_MGM_REPORT 131 #define ICMPV6_MGM_REDUCTION 132 + +#define ICMPV6_NI_QUERY 139 +#define ICMPV6_NI_REPLY 140 + #define ICMPV6_MLD2_REPORT 143 +#define ICMPV6_DHAAD_REQUEST 144 +#define ICMPV6_DHAAD_REPLY 145 +#define ICMPV6_MOBILE_PREFIX_SOL 146 +#define ICMPV6_MOBILE_PREFIX_ADV 147 + /* * Codes for Destination Unreachable */ diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 739b49053156..4faafff32e7b 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -646,7 +646,13 @@ static int icmpv6_rcv(struct sk_buff **pskb, unsigned int *nhoffp) break; case ICMPV6_MGM_REDUCTION: + case ICMPV6_NI_QUERY: + case ICMPV6_NI_REPLY: case ICMPV6_MLD2_REPORT: + case ICMPV6_DHAAD_REQUEST: + case ICMPV6_DHAAD_REPLY: + case ICMPV6_MOBILE_PREFIX_SOL: + case ICMPV6_MOBILE_PREFIX_ADV: break; default: -- cgit v1.2.3