netfilter: nf_conntrack: pass template to l4proto ->error() handler

[safe/jmp/linux-2.6] / include / linux / if_frad.h

diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 395f0aa..80b3a10 100644 (file)
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -24,11 +24,8 @@
 #ifndef _FRAD_H_
 #define _FRAD_H_
 
-#include <linux/config.h>
 #include <linux/if.h>
 
-#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
-
 /* Structures and constants associated with the DLCI device driver */
 
 struct dlci_add
@@ -72,11 +69,6 @@ struct dlci_conf {
 
 #define DLCI_VALID_FLAGS       0x000B
 
-/* FRAD driver uses these to indicate what it did with packet */
-#define DLCI_RET_OK            0x00
-#define DLCI_RET_ERR           0x01
-#define DLCI_RET_DROP          0x02
-
 /* defines for the actual Frame Relay hardware */
 #define FRAD_GET_CONF  (SIOCDEVPRIVATE)
 #define FRAD_SET_CONF  (SIOCDEVPRIVATE + 1)
@@ -128,6 +120,8 @@ struct frad_conf
 
 #ifdef __KERNEL__
 
+#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
+
 /* these are the fields of an RFC 1490 header */
 struct frhdr
 {
@@ -138,7 +132,7 @@ struct frhdr
 
    unsigned char  NLPID;
    unsigned char  OUI[3];
-   unsigned short PID;
+   __be16 PID;
 
 #define IP_NLPID pad 
 } __attribute__((packed));
@@ -154,7 +148,6 @@ struct frhdr
 
 struct dlci_local
 {
-   struct net_device_stats stats;
    struct net_device      *master;
    struct net_device      *slave;
    struct dlci_conf       config;
@@ -191,12 +184,10 @@ struct frad_local
    int               buffer;           /* current buffer for S508 firmware */
 };
 
-#endif /* __KERNEL__ */
-
 #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
 
-#ifdef __KERNEL__
 extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
-#endif
+
+#endif /* __KERNEL__ */
 
 #endif