summaryrefslogtreecommitdiffstats
path: root/include/net/raw.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-03 08:44:09 +0200
committerLen Brown <len.brown@intel.com>2005-09-03 08:44:09 +0200
commit129521dcc94f781890f8f668219ab79f0073ff9f (patch)
tree9f70707c88da65577f38814fe37b24c4b4957d64 /include/net/raw.h
parent[ACPI] acpi_video_device_write_state() now works (diff)
parentMerge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/... (diff)
downloadlinux-129521dcc94f781890f8f668219ab79f0073ff9f.tar.xz
linux-129521dcc94f781890f8f668219ab79f0073ff9f.zip
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'include/net/raw.h')
-rw-r--r--include/net/raw.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/raw.h b/include/net/raw.h
index 1c411c45587a..f47917469b12 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -17,10 +17,10 @@
#ifndef _RAW_H
#define _RAW_H
+#include <linux/config.h>
extern struct proto raw_prot;
-
extern void raw_err(struct sock *, struct sk_buff *, u32 info);
extern int raw_rcv(struct sock *, struct sk_buff *);
@@ -37,6 +37,11 @@ extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
unsigned long raddr, unsigned long laddr,
int dif);
-extern void raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
+extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
+
+#ifdef CONFIG_PROC_FS
+extern int raw_proc_init(void);
+extern void raw_proc_exit(void);
+#endif
#endif /* _RAW_H */