diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/atm/clip.c | 3 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 87a454f5c8..121bf6f491 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/if.h> /* for IFF_UP */ | 23 | #include <linux/if.h> /* for IFF_UP */ |
24 | #include <linux/inetdevice.h> | 24 | #include <linux/inetdevice.h> |
25 | #include <linux/bitops.h> | 25 | #include <linux/bitops.h> |
26 | #include <linux/poison.h> | ||
26 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
27 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
28 | #include <linux/rcupdate.h> | 29 | #include <linux/rcupdate.h> |
@@ -266,7 +267,7 @@ static void clip_neigh_destroy(struct neighbour *neigh) | |||
266 | DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh); | 267 | DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh); |
267 | if (NEIGH2ENTRY(neigh)->vccs) | 268 | if (NEIGH2ENTRY(neigh)->vccs) |
268 | printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n"); | 269 | printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n"); |
269 | NEIGH2ENTRY(neigh)->vccs = (void *) 0xdeadbeef; | 270 | NEIGH2ENTRY(neigh)->vccs = (void *) NEIGHBOR_DEAD; |
270 | } | 271 | } |
271 | 272 | ||
272 | static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb) | 273 | static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb) |
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 7ef143c0eb..f26898b003 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/poison.h> | ||
28 | #include <linux/icmpv6.h> | 29 | #include <linux/icmpv6.h> |
29 | #include <net/ipv6.h> | 30 | #include <net/ipv6.h> |
30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
@@ -376,7 +377,7 @@ ip6t_do_table(struct sk_buff **pskb, | |||
376 | } while (!hotdrop); | 377 | } while (!hotdrop); |
377 | 378 | ||
378 | #ifdef CONFIG_NETFILTER_DEBUG | 379 | #ifdef CONFIG_NETFILTER_DEBUG |
379 | ((struct ip6t_entry *)table_base)->comefrom = 0xdead57ac; | 380 | ((struct ip6t_entry *)table_base)->comefrom = NETFILTER_LINK_POISON; |
380 | #endif | 381 | #endif |
381 | read_unlock_bh(&table->lock); | 382 | read_unlock_bh(&table->lock); |
382 | 383 | ||