summaryrefslogtreecommitdiff
path: root/include/net/pptp.h
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2016-08-12 19:30:48 +0300
committerDavid S. Miller <davem@davemloft.net>2016-08-15 20:55:53 +0300
commit03459345bc00da70a35fa39bcfcf13d779097074 (patch)
treec9db9f4cd4b85de2e4df5008d2decfd96c568ca4 /include/net/pptp.h
parentcfad65c7fa9e77c27025eb5c2098cfbd4d445eab (diff)
downloadlinux-03459345bc00da70a35fa39bcfcf13d779097074.tar.xz
pptp: Refactor the struct and macros of PPTP codes
1. Use struct gre_base_hdr directly in pptp_gre_header instead of duplicated members; 2. Use existing macros like GRE_KEY, GRE_SEQ, and so on instead of duplicated macros defined by PPTP; 3. Add new macros like GRE_IS_ACK/SEQ and so on instead of PPTP_GRE_IS_A/S and so on; Signed-off-by: Gao Feng <fgao@ikuai8.com> Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pptp.h')
-rw-r--r--include/net/pptp.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/include/net/pptp.h b/include/net/pptp.h
index 301d3e2ba1f9..92e9f1fe2628 100644
--- a/include/net/pptp.h
+++ b/include/net/pptp.h
@@ -10,26 +10,9 @@
((((curseq) & 0xffffff00) == 0) &&\
(((lastseq) & 0xffffff00) == 0xffffff00))
-#define PPTP_GRE_PROTO 0x880B
-#define PPTP_GRE_VER 0x1
-
-#define PPTP_GRE_FLAG_C 0x80
-#define PPTP_GRE_FLAG_R 0x40
-#define PPTP_GRE_FLAG_K 0x20
-#define PPTP_GRE_FLAG_S 0x10
-#define PPTP_GRE_FLAG_A 0x80
-
-#define PPTP_GRE_IS_C(f) ((f)&PPTP_GRE_FLAG_C)
-#define PPTP_GRE_IS_R(f) ((f)&PPTP_GRE_FLAG_R)
-#define PPTP_GRE_IS_K(f) ((f)&PPTP_GRE_FLAG_K)
-#define PPTP_GRE_IS_S(f) ((f)&PPTP_GRE_FLAG_S)
-#define PPTP_GRE_IS_A(f) ((f)&PPTP_GRE_FLAG_A)
-
#define PPTP_HEADER_OVERHEAD (2+sizeof(struct pptp_gre_header))
struct pptp_gre_header {
- u8 flags;
- u8 ver;
- __be16 protocol;
+ struct gre_base_hdr gre_hd;
__be16 payload_len;
__be16 call_id;
__be32 seq;