Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 3 insertions, 81 deletions

diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index e53ff65935dd..4ea1d377e1ad 100644
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -10,6 +10,9 @@
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H
 
+#include <uapi/linux/ppp-comp.h>
+
+
 struct module;
 
 /*
@@ -98,87 +101,6 @@ struct compressor {
 #define DECOMP_ERROR            -1      /* error detected before decomp. */
 #define DECOMP_FATALERROR       -2      /* error detected after decomp. */
 
-/*
- * CCP codes.
- */
-
-#define CCP_CONFREQ     1
-#define CCP_CONFACK     2
-#define CCP_TERMREQ     5
-#define CCP_TERMACK     6
-#define CCP_RESETREQ    14
-#define CCP_RESETACK    15
-
-/*
- * Max # bytes for a CCP option
- */
-
-#define CCP_MAX_OPTION_LENGTH   32
-
-/*
- * Parts of a CCP packet.
- */
-
-#define CCP_CODE(dp)            ((dp)[0])
-#define CCP_ID(dp)              ((dp)[1])
-#define CCP_LENGTH(dp)          (((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN              4
-
-#define CCP_OPT_CODE(dp)        ((dp)[0])
-#define CCP_OPT_LENGTH(dp)      ((dp)[1])
-#define CCP_OPT_MINLEN          2
-
-/*
- * Definitions for BSD-Compress.
- */
-
-#define CI_BSD_COMPRESS         21      /* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS      3       /* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)            ((x) & 0x1F)    /* number of bits requested */
-#define BSD_VERSION(x)          ((x) >> 5)      /* version of option format */
-#define BSD_CURRENT_VERSION     1               /* current version number */
-#define BSD_MAKE_OPT(v, n)      (((v) << 5) | (n))
-
-#define BSD_MIN_BITS            9       /* smallest code size supported */
-#define BSD_MAX_BITS            15      /* largest code size supported */
-
-/*
- * Definitions for Deflate.
- */
-
-#define CI_DEFLATE              26      /* config option for Deflate */
-#define CI_DEFLATE_DRAFT        24      /* value used in original draft RFC */
-#define CILEN_DEFLATE           4       /* length of its config option */
-
-#define DEFLATE_MIN_SIZE        9
-#define DEFLATE_MAX_SIZE        15
-#define DEFLATE_METHOD_VAL      8
-#define DEFLATE_SIZE(x)         (((x) >> 4) + 8)
-#define DEFLATE_METHOD(x)       ((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)     ((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE    0
-
-/*
- * Definitions for MPPE.
- */
-
-#define CI_MPPE                18      /* config option for MPPE */
-#define CILEN_MPPE              6      /* length of config option */
-
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-
-#define CI_PREDICTOR_1          1       /* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1       2       /* length of its config option */
-#define CI_PREDICTOR_2          2       /* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2       2       /* length of its config option */
-
-#ifdef __KERNEL__
 extern int ppp_register_compressor(struct compressor *);
 extern void ppp_unregister_compressor(struct compressor *);
-#endif /* __KERNEL__ */
-
 #endif /* _NET_PPP_COMP_H */