From 9661e61c6e42e33fb591976ec15461ad45b71104 Mon Sep 17 00:00:00 2001 From: hotwater Date: Fri, 24 May 2019 18:09:30 +0300 Subject: [PATCH] Import 5.1rc changes --- src/wl/sys/wl_cfg80211_hybrid.c | 2 +- src/wl/sys/wl_iw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c index 1ec2ef3..ef2c54e 100644 --- a/src/wl/sys/wl_cfg80211_hybrid.c +++ b/src/wl/sys/wl_cfg80211_hybrid.c @@ -457,7 +457,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) ifr.ifr_data = (caddr_t)&ioc; fs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); #if defined(WL_USE_NETDEV_OPS) err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); #else diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c index c4c610b..9c3c74e 100644 --- a/src/wl/sys/wl_iw.c +++ b/src/wl/sys/wl_iw.c @@ -117,7 +117,7 @@ dev_wlc_ioctl( ifr.ifr_data = (caddr_t) &ioc; fs = get_fs(); - set_fs(get_ds()); + set_fs(KERNEL_DS); #if defined(WL_USE_NETDEV_OPS) ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); #else -- 2.21.0