git.iko.soy/typeable/nixpkgs
on master help sign in
broadcom_sta: fix build on linux-5.1
commit75a60db00e85589791cbc7db676415fe4beca05a authorgeorgewhewell <georgerw@gmail.com> dateSat 18 May 2019, 21:36 (8 years ago) parent60277c7
2 files changed+33
pkgs/os-specific/linux/broadcom-sta/default.nix+1 pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch+32
pkgs/os-specific/linux/broadcom-sta/default.nix+1
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
3434 # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl
3535 ./linux-4.12.patch
3636 ./linux-4.15.patch
37+ ./linux-5.1.patch
3738 ./null-pointer-fix.patch
3839 ./gcc.patch
3940 ];
pkgs/os-specific/linux/broadcom-sta/linux-5.1.patchnew file+32
@@ -0,0 +1,32 @@
1+commit bcb06af629a36eb84f9a35ac599ec7e51e2d39fb
2+Author: georgewhewell <georgerw@gmail.com>
3+Date: Sat May 18 21:22:37 2019 +0100
4+
5+ find src -type f -name \'*.c\' -exec sed -i "s/get_ds()/KERNEL_DS/g" {} \;
6+
7+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
8+index 7b606e0..51c81bc 100644
9+--- a/src/wl/sys/wl_cfg80211_hybrid.c
10++++ b/src/wl/sys/wl_cfg80211_hybrid.c
11+@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
12+ ifr.ifr_data = (caddr_t)&ioc;
13+
14+ fs = get_fs();
15+- set_fs(get_ds());
16++ set_fs(KERNEL_DS);
17+ #if defined(WL_USE_NETDEV_OPS)
18+ err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
19+ #else
20+diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
21+index c4c610b..9c3c74e 100644
22+--- a/src/wl/sys/wl_iw.c
23++++ b/src/wl/sys/wl_iw.c
24+@@ -117,7 +117,7 @@ dev_wlc_ioctl(
25+ ifr.ifr_data = (caddr_t) &ioc;
26+
27+ fs = get_fs();
28+- set_fs(get_ds());
29++ set_fs(KERNEL_DS);
30+ #if defined(WL_USE_NETDEV_OPS)
31+ ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
32+ #else