Browse Source

Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
David Woodhouse 19 years ago
parent
commit
2c88f4a8bc
1 changed files with 4 additions and 10 deletions
  1. 4 10
      include/linux/ppp_defs.h

+ 4 - 10
include/linux/ppp_defs.h

@@ -42,8 +42,6 @@
 #ifndef _PPP_DEFS_H_
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
 
-#include <linux/crc-ccitt.h>
-
 /*
 /*
  * The basic PPP frame.
  * The basic PPP frame.
  */
  */
@@ -97,7 +95,11 @@
 
 
 #define PPP_INITFCS	0xffff	/* Initial FCS value */
 #define PPP_INITFCS	0xffff	/* Initial FCS value */
 #define PPP_GOODFCS	0xf0b8	/* Good final 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)
 #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
+#endif
 
 
 /*
 /*
  * Extended asyncmap - allows any character to be escaped.
  * 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 */
     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_ */
 #endif /* _PPP_DEFS_H_ */