X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=kernel%2Flinux%2Finclude%2Flinux%2Fnetfilter_ipv4%2Fip_conntrack_pptp.h;h=0fbec884a2e6baed4f72ad6adf9d3479884cfdaa;hp=5155f57ec892a785936ba1c4255a12ee85aae5c2;hb=57a096f051259ceaefd5977f30d269884e1dd248;hpb=9887430fc6b7c0f8eb8e81de2bfe3bba12d8d4a1

diff --git a/kernel/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h b/kernel/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
index 5155f57e..0fbec884 100755
--- a/kernel/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/kernel/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -50,25 +50,6 @@ DECLARE_LOCK_EXTERN(ip_pptp_lock);
 
 #define IP_CONNTR_PPTP		PPTP_CONTROL_PORT
 
-union pptp_ctrl_union {
-                void				*rawreq;
-		struct PptpStartSessionRequest	*sreq;
-		struct PptpStartSessionReply	*srep;
-		struct PptpStopSessionReqest	*streq;
-		struct PptpStopSessionReply	*strep;
-                struct PptpOutCallRequest       *ocreq;
-                struct PptpOutCallReply         *ocack;
-                struct PptpInCallRequest        *icreq;
-                struct PptpInCallReply          *icack;
-                struct PptpInCallConnected      *iccon;
-		struct PptpClearCallRequest	*clrreq;
-                struct PptpCallDisconnectNotify *disc;
-                struct PptpWanErrorNotify       *wanerr;
-                struct PptpSetLinkInfo          *setlink;
-};
-
-
-
 #define PPTP_CONTROL_PORT	1723
 
 #define PPTP_PACKET_CONTROL	1
@@ -309,5 +290,21 @@ struct pptp_priv_data {
 	__u16	pcall_id;
 };
 
+union pptp_ctrl_union {
+		struct PptpStartSessionRequest	sreq;
+		struct PptpStartSessionReply	srep;
+		struct PptpStopSessionRequest	streq;
+		struct PptpStopSessionReply	strep;
+                struct PptpOutCallRequest       ocreq;
+                struct PptpOutCallReply         ocack;
+                struct PptpInCallRequest        icreq;
+                struct PptpInCallReply          icack;
+                struct PptpInCallConnected      iccon;
+		struct PptpClearCallRequest	clrreq;
+                struct PptpCallDisconnectNotify disc;
+                struct PptpWanErrorNotify       wanerr;
+                struct PptpSetLinkInfo          setlink;
+};
+
 #endif /* __KERNEL__ */
 #endif /* _CONNTRACK_PPTP_H */