www.usr.com/support/gpl/USR9107_release.1.4.tar.gz

[bcm963xx.git] / kernel / linux / include / linux / netfilter_ipv4 / ip_conntrack_pptp.h

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 5155f57..0fbec88 100755 (executable)
--- 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
 
 
 #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
 #define PPTP_CONTROL_PORT      1723
 
 #define PPTP_PACKET_CONTROL    1


@@ -309,5 +290,21 @@ struct pptp_priv_data {
        __u16   pcall_id;
 };
 
        __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 */
 #endif /* __KERNEL__ */
 #endif /* _CONNTRACK_PPTP_H */