summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-04 12:07:37 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-04 12:07:37 +0100
commit2c88f4a8bc4276013f7eee7824056d9cecccadb1 (patch)
tree0a6711528c7e6aa65cd0e8a4a49b2ad75809aadf
parent90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a (diff)
Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/linux/ppp_defs.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 402056cd049d..c6b13ff85028 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -42,8 +42,6 @@
#ifndef _PPP_DEFS_H_
#define _PPP_DEFS_H_
-#include <linux/crc-ccitt.h>
-
/*
* The basic PPP frame.
*/
@@ -97,7 +95,11 @@
#define PPP_INITFCS 0xffff /* Initial FCS value */
#define PPP_GOODFCS 0xf0b8 /* Good final FCS value */
+
+#ifdef __KERNEL__
+#include <linux/crc-ccitt.h>
#define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
+#endif
/*
* Extended asyncmap - allows any character to be escaped.
@@ -179,12 +181,4 @@ struct ppp_idle {
time_t recv_idle; /* time since last NP packet received */
};
-#ifndef __P
-#ifdef __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
-#endif
-
#endif /* _PPP_DEFS_H_ */