summaryrefslogtreecommitdiff
path: root/include/net/wext.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-07-22 02:16:54 +0400
committerAndi Kleen <ak@linux.intel.com>2008-07-22 02:16:54 +0400
commit8294fafdafc602ed11f401c44628fab8558c5cf5 (patch)
treec8d0371cfd05226b56d52bfde9c69f8caca4501d /include/net/wext.h
parent725c3a2d70f958adee807c178178819a50f68a56 (diff)
parentbf20e740a4bcc686de02e2fd1c1810a58872f46e (diff)
downloadlinux-8294fafdafc602ed11f401c44628fab8558c5cf5.tar.xz
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'include/net/wext.h')
-rw-r--r--include/net/wext.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/net/wext.h b/include/net/wext.h
index 80b31d826b7a..6d76a39a9c5b 100644
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -12,6 +12,8 @@ extern int wext_proc_init(struct net *net);
extern void wext_proc_exit(struct net *net);
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);
#else
static inline int wext_proc_init(struct net *net)
{
@@ -26,6 +28,11 @@ static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned
{
return -EINVAL;
}
+static inline int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
+ unsigned long arg)
+{
+ return -EINVAL;
+}
#endif
#endif /* __NET_WEXT_H */