diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | legacy-wireless-ioctls-4.9+.patch | 79 |
3 files changed, 0 insertions, 88 deletions
@@ -1,5 +1,3 @@ -# Generated by makepkg 5.2.2 -# Sat Sep 12 02:10:52 UTC 2020 pkgbase = linux-shmilee pkgver = 5.4.64 pkgrel = 1 @@ -20,7 +18,6 @@ pkgbase = linux-shmilee source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz source = https://raw.githubusercontent.com/dolohow/uksm/150e27c4e7f66e4519c89573305eca8c42091f4d/v5.x/uksm-5.4.patch source = linux-cjktty-5.4.patch::https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8.patch - source = legacy-wireless-ioctls-4.9+.patch source = sphinx-workaround.patch source = ck-patch-for-5.4.57+.patch source = ck-patch-for-5.4.62+.patch @@ -41,7 +38,6 @@ pkgbase = linux-shmilee sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c sha256sums = 81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e sha256sums = 50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a - sha256sums = edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0 sha256sums = b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e sha256sums = a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f sha256sums = 0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923 @@ -70,7 +70,6 @@ source=( ${_CK_PATCH} ${_UKSM_PATCH} ${_CJKTTY_PATCH} - 'legacy-wireless-ioctls-4.9+.patch' 'sphinx-workaround.patch' 'ck-patch-for-5.4.57+.patch' 'ck-patch-for-5.4.62+.patch' @@ -95,7 +94,6 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' 'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c' '81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e' '50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a' - 'edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0' 'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e' 'a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f' '0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923' @@ -160,9 +158,6 @@ prepare() { patch -i ../linux-cjktty-patch-for-5.4.62+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch" - msg "Patching source to reinstate the legacy wireless ioctls" - patch -Np2 -i ../legacy-wireless-ioctls-4.9+.patch - msg "Patching sphinx extensions for htmldocs" patch -Np1 -i ../sphinx-workaround.patch diff --git a/legacy-wireless-ioctls-4.9+.patch b/legacy-wireless-ioctls-4.9+.patch deleted file mode 100644 index 715325283ff9..000000000000 --- a/legacy-wireless-ioctls-4.9+.patch +++ /dev/null @@ -1,79 +0,0 @@ -fix: ioctl[RTL_IOCTL_HOSTAPD]: Operation not supported -from: https://github.com/lwfinger/rtl8188eu/issues/257 -author: Ablinne -url: https://pastebin.com/2nmLS4d6 - ---- src_orig/archlinux-linux/net/wireless/wext-core.c 2018-12-07 15:55:27.385876108 +0100 -+++ src/archlinux-linux/net/wireless/wext-core.c 2018-12-07 13:40:56.138049613 +0100 -@@ -912,12 +912,13 @@ - * Main IOCTl dispatcher. - * Check the type of IOCTL and call the appropriate wrapper... - */ --static int wireless_process_ioctl(struct net *net, struct iwreq *iwr, -+static int wireless_process_ioctl(struct net *net, struct ifreq *ifr, - unsigned int cmd, - struct iw_request_info *info, - wext_ioctl_func standard, - wext_ioctl_func private) - { -+ struct iwreq *iwr = (struct iwreq *) ifr; - struct net_device *dev; - iw_handler handler; - -@@ -925,7 +926,7 @@ - * The copy_to/from_user() of ifr is also dealt with in there */ - - /* Make sure the device exist */ -- if ((dev = __dev_get_by_name(net, iwr->ifr_name)) == NULL) -+ if ((dev = __dev_get_by_name(net, ifr->ifr_name)) == NULL) - return -ENODEV; - - /* A bunch of special cases, then the generic case... -@@ -954,6 +955,9 @@ - else if (private) - return private(dev, iwr, cmd, info, handler); - } -+ /* Old driver API : call driver ioctl handler */ -+ if (dev->netdev_ops->ndo_do_ioctl) -+ return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd); - return -EOPNOTSUPP; - } - -@@ -971,7 +975,7 @@ - } - - /* entry point from dev ioctl */ --static int wext_ioctl_dispatch(struct net *net, struct iwreq *iwr, -+static int wext_ioctl_dispatch(struct net *net, struct ifreq *ifr, - unsigned int cmd, struct iw_request_info *info, - wext_ioctl_func standard, - wext_ioctl_func private) -@@ -981,9 +985,9 @@ - if (ret) - return ret; - -- dev_load(net, iwr->ifr_name); -+ dev_load(net, ifr->ifr_name); - rtnl_lock(); -- ret = wireless_process_ioctl(net, iwr, cmd, info, standard, private); -+ ret = wireless_process_ioctl(net, ifr, cmd, info, standard, private); - rtnl_unlock(); - - return ret; -@@ -1044,7 +1048,7 @@ - - iwr.ifr_name[sizeof(iwr.ifr_name) - 1] = 0; - -- ret = wext_ioctl_dispatch(net, &iwr, cmd, &info, -+ ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info, - ioctl_standard_call, - ioctl_private_call); - if (ret >= 0 && -@@ -1106,7 +1110,7 @@ - info.cmd = cmd; - info.flags = IW_REQUEST_FLAG_COMPAT; - -- ret = wext_ioctl_dispatch(net, &iwr, cmd, &info, -+ ret = wext_ioctl_dispatch(net, (struct ifreq *) &iwr, cmd, &info, - compat_standard_call, - compat_private_call); |