diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-07-28 04:59:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-07-28 04:59:49 -0700 |
| commit | ee96d98e22d8435f5f3fa15888ed367f03a561e5 (patch) | |
| tree | 37b9490bda10078b7397435358c50097589ca521 /net | |
| parent | b540caa7c00f358ea51db999619054d585d5522b (diff) | |
| parent | 94829b2cbe8b84f403306ee909418d9112cff832 (diff) | |
| download | history-ee96d98e22d8435f5f3fa15888ed367f03a561e5.tar.gz | |
Merge bk://bk.skbuff.net:20608/linux-2.6-misc/
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/af_inet6.c | 2 | ||||
| -rw-r--r-- | net/ipv6/icmp.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 980687f39c8fe4..83e832e3e65e01 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -560,8 +560,6 @@ static struct inet_protosw rawv6_protosw = { .flags = INET_PROTOSW_REUSE, }; -#define INETSW6_ARRAY_LEN (sizeof(inetsw6_array) / sizeof(struct inet_protosw)) - void inet6_register_protosw(struct inet_protosw *p) { diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 739b490531560c..4faafff32e7bc7 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: |