caif: Bugfix - use standard Linux lists

[safe/jmp/linux-2.6] / include / net / wext.h

diff --git a/include/net/wext.h b/include/net/wext.h
index 80b31d8..4f6e742 100644 (file)
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -1,17 +1,34 @@
 #ifndef __NET_WEXT_H
 #define __NET_WEXT_H
 
-/*
- * wireless extensions interface to the core code
- */
+#include <net/iw_handler.h>
 
 struct net;
 
-#ifdef CONFIG_WIRELESS_EXT
-extern int wext_proc_init(struct net *net);
-extern void wext_proc_exit(struct net *net);
+#ifdef CONFIG_WEXT_CORE
 extern int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                             void __user *arg);
+extern int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
+                                   unsigned long arg);
+
+extern struct iw_statistics *get_wireless_stats(struct net_device *dev);
+extern int call_commit_handler(struct net_device *dev);
+#else
+static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
+                                   void __user *arg)
+{
+       return -EINVAL;
+}
+static inline int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
+                                          unsigned long arg)
+{
+       return -EINVAL;
+}
+#endif
+
+#ifdef CONFIG_WEXT_PROC
+extern int wext_proc_init(struct net *net);
+extern void wext_proc_exit(struct net *net);
 #else
 static inline int wext_proc_init(struct net *net)
 {
@@ -21,11 +38,23 @@ static inline void wext_proc_exit(struct net *net)
 {
        return;
 }
-static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
-                                   void __user *arg)
-{
-       return -EINVAL;
-}
 #endif
 
+#ifdef CONFIG_WEXT_PRIV
+int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
+                      unsigned int cmd, struct iw_request_info *info,
+                      iw_handler handler);
+int compat_private_call(struct net_device *dev, struct iwreq *iwr,
+                       unsigned int cmd, struct iw_request_info *info,
+                       iw_handler handler);
+int iw_handler_get_private(struct net_device *         dev,
+                          struct iw_request_info *     info,
+                          union iwreq_data *           wrqu,
+                          char *                       extra);
+#else
+#define ioctl_private_call NULL
+#define compat_private_call NULL
+#endif
+
+
 #endif /* __NET_WEXT_H */