summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-27 01:05:20 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-27 01:05:20 +0000
commit546db14ee74118296f425f3b91634fb767d67290 (patch)
tree22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/net
parent1e25e41c4f5474e14452094492dbc169b800e4c8 (diff)
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles and IP27 actually works.
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 4d4dbf7ce..0fb977fbd 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -137,6 +137,7 @@ extern struct linux_mib net_statistics;
extern int sysctl_local_port_range[2];
+#ifdef CONFIG_INET
extern __inline__ int ip_send(struct sk_buff *skb)
{
if (skb->len > skb->dst->pmtu)
@@ -181,6 +182,7 @@ extern __inline__ void ip_eth_mc_map(u32 addr, char *buf)
buf[3]=addr&0x7F;
}
+#endif
extern int ip_call_ra_chain(struct sk_buff *skb);