tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

wext: Remove compat handling from fs/compat_ioctl.c

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

David S. Miller and committed by
David S. Miller 169a3ec4 87de87d5

+1 -106
+1 -106
fs/compat_ioctl.c
··· 58 58 #include <linux/syscalls.h> 59 59 #include <linux/i2c.h> 60 60 #include <linux/i2c-dev.h> 61 - #include <linux/wireless.h> 62 61 #include <linux/atalk.h> 63 62 #include <linux/loop.h> 64 63 ··· 1756 1757 return sys_ioctl(fd, cmd, (unsigned long)tdata); 1757 1758 } 1758 1759 1759 - static int do_wireless_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) 1760 - { 1761 - struct iwreq __user *iwr; 1762 - struct iwreq __user *iwr_u; 1763 - struct iw_point __user *iwp; 1764 - struct compat_iw_point __user *iwp_u; 1765 - compat_caddr_t pointer_u; 1766 - void __user *pointer; 1767 - __u16 length, flags; 1768 - int ret; 1769 - 1770 - iwr_u = compat_ptr(arg); 1771 - iwp_u = (struct compat_iw_point __user *) &iwr_u->u.data; 1772 - iwr = compat_alloc_user_space(sizeof(*iwr)); 1773 - if (iwr == NULL) 1774 - return -ENOMEM; 1775 - 1776 - iwp = &iwr->u.data; 1777 - 1778 - if (!access_ok(VERIFY_WRITE, iwr, sizeof(*iwr))) 1779 - return -EFAULT; 1780 - 1781 - if (__copy_in_user(&iwr->ifr_ifrn.ifrn_name[0], 1782 - &iwr_u->ifr_ifrn.ifrn_name[0], 1783 - sizeof(iwr->ifr_ifrn.ifrn_name))) 1784 - return -EFAULT; 1785 - 1786 - if (__get_user(pointer_u, &iwp_u->pointer) || 1787 - __get_user(length, &iwp_u->length) || 1788 - __get_user(flags, &iwp_u->flags)) 1789 - return -EFAULT; 1790 - 1791 - if (__put_user(compat_ptr(pointer_u), &iwp->pointer) || 1792 - __put_user(length, &iwp->length) || 1793 - __put_user(flags, &iwp->flags)) 1794 - return -EFAULT; 1795 - 1796 - ret = sys_ioctl(fd, cmd, (unsigned long) iwr); 1797 - 1798 - if (__get_user(pointer, &iwp->pointer) || 1799 - __get_user(length, &iwp->length) || 1800 - __get_user(flags, &iwp->flags)) 1801 - return -EFAULT; 1802 - 1803 - if (__put_user(ptr_to_compat(pointer), &iwp_u->pointer) || 1804 - __put_user(length, &iwp_u->length) || 1805 - __put_user(flags, &iwp_u->flags)) 1806 - return -EFAULT; 1807 - 1808 - return ret; 1809 - } 1810 - 1811 1760 /* Since old style bridge ioctl's endup using SIOCDEVPRIVATE 1812 1761 * for some operations; this forces use of the newer bridge-utils that 1813 1762 * use compatiable ioctls ··· 2436 2489 COMPATIBLE_IOCTL(I2C_PEC) 2437 2490 COMPATIBLE_IOCTL(I2C_RETRIES) 2438 2491 COMPATIBLE_IOCTL(I2C_TIMEOUT) 2439 - /* wireless */ 2440 - COMPATIBLE_IOCTL(SIOCSIWCOMMIT) 2441 - COMPATIBLE_IOCTL(SIOCGIWNAME) 2442 - COMPATIBLE_IOCTL(SIOCSIWNWID) 2443 - COMPATIBLE_IOCTL(SIOCGIWNWID) 2444 - COMPATIBLE_IOCTL(SIOCSIWFREQ) 2445 - COMPATIBLE_IOCTL(SIOCGIWFREQ) 2446 - COMPATIBLE_IOCTL(SIOCSIWMODE) 2447 - COMPATIBLE_IOCTL(SIOCGIWMODE) 2448 - COMPATIBLE_IOCTL(SIOCSIWSENS) 2449 - COMPATIBLE_IOCTL(SIOCGIWSENS) 2450 - COMPATIBLE_IOCTL(SIOCSIWRANGE) 2451 - COMPATIBLE_IOCTL(SIOCSIWPRIV) 2452 - COMPATIBLE_IOCTL(SIOCSIWSTATS) 2453 - COMPATIBLE_IOCTL(SIOCSIWAP) 2454 - COMPATIBLE_IOCTL(SIOCGIWAP) 2455 - COMPATIBLE_IOCTL(SIOCSIWRATE) 2456 - COMPATIBLE_IOCTL(SIOCGIWRATE) 2457 - COMPATIBLE_IOCTL(SIOCSIWRTS) 2458 - COMPATIBLE_IOCTL(SIOCGIWRTS) 2459 - COMPATIBLE_IOCTL(SIOCSIWFRAG) 2460 - COMPATIBLE_IOCTL(SIOCGIWFRAG) 2461 - COMPATIBLE_IOCTL(SIOCSIWTXPOW) 2462 - COMPATIBLE_IOCTL(SIOCGIWTXPOW) 2463 - COMPATIBLE_IOCTL(SIOCSIWRETRY) 2464 - COMPATIBLE_IOCTL(SIOCGIWRETRY) 2465 - COMPATIBLE_IOCTL(SIOCSIWPOWER) 2466 - COMPATIBLE_IOCTL(SIOCGIWPOWER) 2467 - COMPATIBLE_IOCTL(SIOCSIWAUTH) 2468 - COMPATIBLE_IOCTL(SIOCGIWAUTH) 2469 2492 /* hiddev */ 2470 2493 COMPATIBLE_IOCTL(HIDIOCGVERSION) 2471 2494 COMPATIBLE_IOCTL(HIDIOCAPPLICATION) ··· 2666 2749 HANDLE_IOCTL(I2C_FUNCS, w_long) 2667 2750 HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl) 2668 2751 HANDLE_IOCTL(I2C_SMBUS, do_i2c_smbus_ioctl) 2669 - /* wireless */ 2670 - HANDLE_IOCTL(SIOCGIWRANGE, do_wireless_ioctl) 2671 - HANDLE_IOCTL(SIOCGIWPRIV, do_wireless_ioctl) 2672 - HANDLE_IOCTL(SIOCGIWSTATS, do_wireless_ioctl) 2673 - HANDLE_IOCTL(SIOCSIWSPY, do_wireless_ioctl) 2674 - HANDLE_IOCTL(SIOCGIWSPY, do_wireless_ioctl) 2675 - HANDLE_IOCTL(SIOCSIWTHRSPY, do_wireless_ioctl) 2676 - HANDLE_IOCTL(SIOCGIWTHRSPY, do_wireless_ioctl) 2677 - HANDLE_IOCTL(SIOCSIWMLME, do_wireless_ioctl) 2678 - HANDLE_IOCTL(SIOCGIWAPLIST, do_wireless_ioctl) 2679 - HANDLE_IOCTL(SIOCSIWSCAN, do_wireless_ioctl) 2680 - HANDLE_IOCTL(SIOCGIWSCAN, do_wireless_ioctl) 2681 - HANDLE_IOCTL(SIOCSIWESSID, do_wireless_ioctl) 2682 - HANDLE_IOCTL(SIOCGIWESSID, do_wireless_ioctl) 2683 - HANDLE_IOCTL(SIOCSIWNICKN, do_wireless_ioctl) 2684 - HANDLE_IOCTL(SIOCGIWNICKN, do_wireless_ioctl) 2685 - HANDLE_IOCTL(SIOCSIWENCODE, do_wireless_ioctl) 2686 - HANDLE_IOCTL(SIOCGIWENCODE, do_wireless_ioctl) 2687 - HANDLE_IOCTL(SIOCSIWGENIE, do_wireless_ioctl) 2688 - HANDLE_IOCTL(SIOCGIWGENIE, do_wireless_ioctl) 2689 - HANDLE_IOCTL(SIOCSIWENCODEEXT, do_wireless_ioctl) 2690 - HANDLE_IOCTL(SIOCGIWENCODEEXT, do_wireless_ioctl) 2691 - HANDLE_IOCTL(SIOCSIWPMKSA, do_wireless_ioctl) 2752 + /* bridge */ 2692 2753 HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl) 2693 2754 HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl) 2694 2755 /* Not implemented in the native kernel */