summaryrefslogtreecommitdiffstats
path: root/net/802
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
commit86464aed71025541805e7b1515541aee89879e33 (patch)
treee01a457a4912a8553bc65524aa3125d51f29f810 /net/802
parent88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff)
Merge with Linux 2.2.1.
Diffstat (limited to 'net/802')
-rw-r--r--net/802/tr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index f708fe881..a8f77970e 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -154,10 +154,12 @@ int tr_rebuild_header(struct sk_buff *skb)
return 0;
}
+#ifdef CONFIG_INET
if(arp_find(trh->daddr, skb)) {
return 1;
}
else
+#endif
{
tr_source_route(skb,trh,dev);
return 0;