Commit 87477c8b authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/home/davem/src/BK/BAK-net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 702d27c7 916db246
...@@ -2068,6 +2068,7 @@ __u32 secure_tcpv6_sequence_number(__u32 *saddr, __u32 *daddr, ...@@ -2068,6 +2068,7 @@ __u32 secure_tcpv6_sequence_number(__u32 *saddr, __u32 *daddr,
seq += tv.tv_usec + tv.tv_sec*1000000; seq += tv.tv_usec + tv.tv_sec*1000000;
return seq; return seq;
} }
EXPORT_SYMBOL(secure_tcpv6_sequence_number);
__u32 secure_ipv6_id(__u32 *daddr) __u32 secure_ipv6_id(__u32 *daddr)
{ {
...@@ -2088,6 +2089,7 @@ __u32 secure_ipv6_id(__u32 *daddr) ...@@ -2088,6 +2089,7 @@ __u32 secure_ipv6_id(__u32 *daddr)
return twothirdsMD4Transform(daddr, secret); return twothirdsMD4Transform(daddr, secret);
} }
EXPORT_SYMBOL(secure_ipv6_id);
#endif #endif
......
...@@ -54,12 +54,6 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev); ...@@ -54,12 +54,6 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev);
static int neigh_glbl_allocs; static int neigh_glbl_allocs;
static struct neigh_table *neigh_tables; static struct neigh_table *neigh_tables;
#if defined(__i386__) && defined(CONFIG_SMP)
#define ASSERT_WL(n) if ((int)((n)->lock.lock) > 0) { printk("WL assertion failed at " __FILE__ "(%d):" __FUNCTION__ "\n", __LINE__); }
#else
#define ASSERT_WL(n) do { } while(0)
#endif
/* /*
Neighbour hash table buckets are protected with rwlock tbl->lock. Neighbour hash table buckets are protected with rwlock tbl->lock.
...@@ -484,8 +478,6 @@ static void neigh_suspect(struct neighbour *neigh) ...@@ -484,8 +478,6 @@ static void neigh_suspect(struct neighbour *neigh)
NEIGH_PRINTK2("neigh %p is suspecteded.\n", neigh); NEIGH_PRINTK2("neigh %p is suspecteded.\n", neigh);
ASSERT_WL(neigh);
neigh->output = neigh->ops->output; neigh->output = neigh->ops->output;
for (hh = neigh->hh; hh; hh = hh->hh_next) for (hh = neigh->hh; hh; hh = hh->hh_next)
...@@ -503,8 +495,6 @@ static void neigh_connect(struct neighbour *neigh) ...@@ -503,8 +495,6 @@ static void neigh_connect(struct neighbour *neigh)
NEIGH_PRINTK2("neigh %p is connected.\n", neigh); NEIGH_PRINTK2("neigh %p is connected.\n", neigh);
ASSERT_WL(neigh);
neigh->output = neigh->ops->connected_output; neigh->output = neigh->ops->connected_output;
for (hh = neigh->hh; hh; hh = hh->hh_next) for (hh = neigh->hh; hh; hh = hh->hh_next)
...@@ -529,7 +519,6 @@ static void neigh_sync(struct neighbour *n) ...@@ -529,7 +519,6 @@ static void neigh_sync(struct neighbour *n)
unsigned long now = jiffies; unsigned long now = jiffies;
u8 state = n->nud_state; u8 state = n->nud_state;
ASSERT_WL(n);
if (state&(NUD_NOARP|NUD_PERMANENT)) if (state&(NUD_NOARP|NUD_PERMANENT))
return; return;
if (state&NUD_REACHABLE) { if (state&NUD_REACHABLE) {
......
This diff is collapsed.
...@@ -9,11 +9,13 @@ ...@@ -9,11 +9,13 @@
O_TARGET := ipv6.o O_TARGET := ipv6.o
export-objs := ipv6_syms.o
obj-y := af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \ obj-y := af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \ route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \
protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \ protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \ exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \
ip6_flowlabel.o ip6_flowlabel.o ipv6_syms.o
obj-m := $(O_TARGET) obj-m := $(O_TARGET)
......
#include <linux/module.h>
#include <net/ipv6.h>
#include <net/addrconf.h>
#include <net/ip6_route.h>
EXPORT_SYMBOL(ipv6_addr_type);
EXPORT_SYMBOL(icmpv6_send);
EXPORT_SYMBOL(ndisc_mc_map);
EXPORT_SYMBOL(register_inet6addr_notifier);
EXPORT_SYMBOL(unregister_inet6addr_notifier);
EXPORT_SYMBOL(ip6_route_output);
...@@ -286,15 +286,6 @@ EXPORT_SYMBOL(dlci_ioctl_hook); ...@@ -286,15 +286,6 @@ EXPORT_SYMBOL(dlci_ioctl_hook);
#endif #endif
#ifdef CONFIG_IPV6
EXPORT_SYMBOL(ipv6_addr_type);
EXPORT_SYMBOL(icmpv6_send);
EXPORT_SYMBOL(ndisc_mc_map);
EXPORT_SYMBOL(register_inet6addr_notifier);
EXPORT_SYMBOL(unregister_inet6addr_notifier);
#include <net/ip6_route.h>
EXPORT_SYMBOL(ip6_route_output);
#endif
#if defined (CONFIG_IPV6_MODULE) || defined (CONFIG_KHTTPD) || defined (CONFIG_KHTTPD_MODULE) #if defined (CONFIG_IPV6_MODULE) || defined (CONFIG_KHTTPD) || defined (CONFIG_KHTTPD_MODULE)
/* inet functions common to v4 and v6 */ /* inet functions common to v4 and v6 */
EXPORT_SYMBOL(inet_release); EXPORT_SYMBOL(inet_release);
...@@ -401,11 +392,6 @@ EXPORT_SYMBOL(sysctl_tcp_tw_recycle); ...@@ -401,11 +392,6 @@ EXPORT_SYMBOL(sysctl_tcp_tw_recycle);
EXPORT_SYMBOL(sysctl_max_syn_backlog); EXPORT_SYMBOL(sysctl_max_syn_backlog);
#endif #endif
#if defined (CONFIG_IPV6_MODULE)
EXPORT_SYMBOL(secure_tcpv6_sequence_number);
EXPORT_SYMBOL(secure_ipv6_id);
#endif
#endif #endif
EXPORT_SYMBOL(tcp_read_sock); EXPORT_SYMBOL(tcp_read_sock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment