diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-05-05 09:25:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-05-05 09:25:25 -0700 |
| commit | 87477c8b07f935f331524f2cecccc628ac0aaf73 (patch) | |
| tree | 892066732a46307dbbffb1e328c233c05e0ddadc /net/core | |
| parent | 702d27c75ce9c624d4015ea61d1cec85e9d140a9 (diff) | |
| parent | 916db246b47a25a8d8c783998a922a5c3a2cf4f6 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/BAK-net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index e1329d03182a..e946af4fba3b 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -54,12 +54,6 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev); static int neigh_glbl_allocs; 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. @@ -484,8 +478,6 @@ static void neigh_suspect(struct neighbour *neigh) NEIGH_PRINTK2("neigh %p is suspecteded.\n", neigh); - ASSERT_WL(neigh); - neigh->output = neigh->ops->output; for (hh = neigh->hh; hh; hh = hh->hh_next) @@ -503,8 +495,6 @@ static void neigh_connect(struct neighbour *neigh) NEIGH_PRINTK2("neigh %p is connected.\n", neigh); - ASSERT_WL(neigh); - neigh->output = neigh->ops->connected_output; for (hh = neigh->hh; hh; hh = hh->hh_next) @@ -529,7 +519,6 @@ static void neigh_sync(struct neighbour *n) unsigned long now = jiffies; u8 state = n->nud_state; - ASSERT_WL(n); if (state&(NUD_NOARP|NUD_PERMANENT)) return; if (state&NUD_REACHABLE) { |