tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / os-specific / linux / broadcom-sta / linux-5.1.patch
at fix-function-merge 39 lines 1.2 kB view raw
1From 35c712b7ad2b20088a1a4e233f1d22d7f6dc2525 Mon Sep 17 00:00:00 2001 2From: georgewhewell <georgerw@gmail.com> 3Date: Sat, 18 May 2019 21:36:26 +0100 4Subject: [PATCH 09/16] linuxPackages.broadcom_sta: fix build for kernel 5.1+ 5 6--- 7 src/wl/sys/wl_cfg80211_hybrid.c | 2 +- 8 src/wl/sys/wl_iw.c | 2 +- 9 2 files changed, 2 insertions(+), 2 deletions(-) 10 11diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c 12index 1893a53..4b3298f 100644 13--- a/src/wl/sys/wl_cfg80211_hybrid.c 14+++ b/src/wl/sys/wl_cfg80211_hybrid.c 15@@ -457,7 +457,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) 16 ifr.ifr_data = (caddr_t)&ioc; 17 18 fs = get_fs(); 19- set_fs(get_ds()); 20+ set_fs(KERNEL_DS); 21 #if defined(WL_USE_NETDEV_OPS) 22 err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); 23 #else 24diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c 25index c4c610b..9c3c74e 100644 26--- a/src/wl/sys/wl_iw.c 27+++ b/src/wl/sys/wl_iw.c 28@@ -117,7 +117,7 @@ dev_wlc_ioctl( 29 ifr.ifr_data = (caddr_t) &ioc; 30 31 fs = get_fs(); 32- set_fs(get_ds()); 33+ set_fs(KERNEL_DS); 34 #if defined(WL_USE_NETDEV_OPS) 35 ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); 36 #else 37-- 382.45.1 39