summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-07-03 19:47:27 -0700
committerDavid S. Miller <davem@davemloft.net>2006-07-03 19:47:27 -0700
commit4bdbf6c033ba05bff65f69989baccd7103c5a530 (patch)
treee4559c8222b066113d441b9545744a1c2bd569fc
parent6508871eddbbd3e62799f3b6182a6a4fd3ef31d5 (diff)
downloadkernel-crypto-4bdbf6c033ba05bff65f69989baccd7103c5a530.tar.gz
kernel-crypto-4bdbf6c033ba05bff65f69989baccd7103c5a530.tar.xz
kernel-crypto-4bdbf6c033ba05bff65f69989baccd7103c5a530.zip
[NET]: add+use poison defines
Add and use poison defines in net/. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/poison.h4
-rw-r--r--net/atm/clip.c3
-rw-r--r--net/ipv6/netfilter/ip6_tables.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/poison.h b/include/linux/poison.h
index a5347c02432..05d7d0fd6bd 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -45,6 +45,10 @@
/********** drivers/atm/ **********/
#define ATM_POISON_FREE 0x12
+/********** net/ **********/
+#define NEIGHBOR_DEAD 0xdeadbeef
+#define NETFILTER_LINK_POISON 0xdead57ac
+
/********** kernel/mutexes **********/
#define MUTEX_DEBUG_INIT 0x11
#define MUTEX_DEBUG_FREE 0x22
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 87a454f5c89..121bf6f4914 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -23,6 +23,7 @@
#include <linux/if.h> /* for IFF_UP */
#include <linux/inetdevice.h>
#include <linux/bitops.h>
+#include <linux/poison.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/rcupdate.h>
@@ -266,7 +267,7 @@ static void clip_neigh_destroy(struct neighbour *neigh)
DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh);
if (NEIGH2ENTRY(neigh)->vccs)
printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n");
- NEIGH2ENTRY(neigh)->vccs = (void *) 0xdeadbeef;
+ NEIGH2ENTRY(neigh)->vccs = (void *) NEIGHBOR_DEAD;
}
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 7ef143c0ebf..f26898b0034 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
#include <linux/netdevice.h>
#include <linux/module.h>
+#include <linux/poison.h>
#include <linux/icmpv6.h>
#include <net/ipv6.h>
#include <asm/uaccess.h>
@@ -376,7 +377,7 @@ ip6t_do_table(struct sk_buff **pskb,
} while (!hotdrop);
#ifdef CONFIG_NETFILTER_DEBUG
- ((struct ip6t_entry *)table_base)->comefrom = 0xdead57ac;
+ ((struct ip6t_entry *)table_base)->comefrom = NETFILTER_LINK_POISON;
#endif
read_unlock_bh(&table->lock);