diff -Naur a/src/shared/linux_osl.c b/src/shared/linux_osl.c --- a/src/shared/linux_osl.c 2015-09-19 00:47:30.000000000 +0200 +++ b/src/shared/linux_osl.c 2020-12-14 13:34:41.810370857 +0100 @@ -30,6 +30,7 @@ #include #include +#include #define PCI_CFG_RETRY 10 @@ -942,7 +943,7 @@ void * osl_reg_map(uint32 pa, uint size) { - return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); + return (ioremap((unsigned long)pa, (unsigned long)size)); } void @@ -1072,11 +1073,21 @@ { struct file *fp = (struct file *)image; int rdlen; + loff_t pos; if (!image) return 0; - rdlen = kernel_read(fp, fp->f_pos, buf, len); + pos = fp->f_pos; + rdlen = kernel_read(fp, +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + pos, +#endif + buf, len +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) + ,&pos +#endif + ); if (rdlen > 0) fp->f_pos += rdlen; diff -Naur a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c --- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-09-19 00:47:30.000000000 +0200 +++ b/src/wl/sys/wl_cfg80211_hybrid.c 2020-12-14 13:37:21.520354758 +0100 @@ -30,6 +30,9 @@ #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) +#include +#endif #include #include #include @@ -38,11 +41,17 @@ #include #include #include +#include #define EVENT_TYPE(e) dtoh32((e)->event_type) #define EVENT_FLAGS(e) dtoh16((e)->flags) #define EVENT_STATUS(e) dtoh32((e)->status) +#ifndef IEEE80211_BAND_2GHZ +#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ +#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ +#endif + #ifdef BCMDBG u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO; #else @@ -50,7 +59,11 @@ #endif static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + enum nl80211_iftype type, struct vif_params *params); +#else enum nl80211_iftype type, u32 *flags, struct vif_params *params); +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) static s32 wl_cfg80211_scan(struct wiphy *wiphy, @@ -435,35 +448,17 @@ static s32 wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) { - struct ifreq ifr; - struct wl_ioctl ioc; - mm_segment_t fs; - s32 err = 0; - BUG_ON(len < sizeof(int)); - - memset(&ioc, 0, sizeof(ioc)); - ioc.cmd = cmd; - ioc.buf = arg; - ioc.len = len; - strcpy(ifr.ifr_name, dev->name); - ifr.ifr_data = (caddr_t)&ioc; - - fs = get_fs(); - set_fs(get_ds()); -#if defined(WL_USE_NETDEV_OPS) - err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#else - err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#endif - set_fs(fs); - - return err; + return wlc_ioctl_internal(dev, cmd, arg, len); } static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + enum nl80211_iftype type, +#else enum nl80211_iftype type, u32 *flags, +#endif struct vif_params *params) { struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); @@ -2358,6 +2353,20 @@ const wl_event_msg_t *e, void *data) { struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + struct cfg80211_bss *bss; + struct wlc_ssid *ssid; + ssid = &wl->profile->ssid; + bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, + ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); + struct cfg80211_roam_info roam_info = { + .bss = bss, + .req_ie = conn_info->req_ie, + .req_ie_len = conn_info->req_ie_len, + .resp_ie = conn_info->resp_ie, + .resp_ie_len = conn_info->resp_ie_len, + }; +#endif s32 err = 0; wl_get_assoc_ies(wl); @@ -2365,12 +2374,17 @@ memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); wl_update_bss_info(wl); cfg80211_roamed(ndev, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + &roam_info, +#else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) &wl->conf->channel, #endif (u8 *)&wl->bssid, conn_info->req_ie, conn_info->req_ie_len, - conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); + conn_info->resp_ie, conn_info->resp_ie_len, +#endif + GFP_KERNEL); WL_DBG(("Report roaming result\n")); set_bit(WL_STATUS_CONNECTED, &wl->status); @@ -2386,8 +2400,15 @@ s32 err = 0; if (wl->scan_request) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) + struct cfg80211_scan_info info = { + .aborted = true + }; WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); - cfg80211_scan_done(wl->scan_request, true); + cfg80211_scan_done(wl->scan_request, &info); +#else + cfg80211_scan_done(wl->scan_request, true); +#endif wl->scan_request = NULL; } @@ -2488,7 +2509,14 @@ scan_done_out: if (wl->scan_request) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) + struct cfg80211_scan_info info = { + .aborted = false + }; + cfg80211_scan_done(wl->scan_request, &info); +#else cfg80211_scan_done(wl->scan_request, false); +#endif wl->scan_request = NULL; } rtnl_unlock(); @@ -2913,7 +2941,14 @@ s32 err = 0; if (wl->scan_request) { - cfg80211_scan_done(wl->scan_request, true); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) + struct cfg80211_scan_info info = { + .aborted = true + }; + cfg80211_scan_done(wl->scan_request, &info); +#else + cfg80211_scan_done(wl->scan_request, true); +#endif wl->scan_request = NULL; } diff -Naur a/src/wl/sys/wlc_pub.h b/src/wl/sys/wlc_pub.h --- a/src/wl/sys/wlc_pub.h 2015-09-19 00:47:30.000000000 +0200 +++ b/src/wl/sys/wlc_pub.h 2020-12-14 13:37:21.522354770 +0100 @@ -24,6 +24,7 @@ #include #include +#include #include "proto/802.11.h" #include "proto/bcmevent.h" diff -Naur a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c --- a/src/wl/sys/wl_iw.c 2015-09-19 00:47:30.000000000 +0200 +++ b/src/wl/sys/wl_iw.c 2020-12-14 13:37:21.521354764 +0100 @@ -37,6 +37,7 @@ #include #include +#include extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason, char* stringBuf, uint buflen); @@ -103,29 +104,7 @@ int len ) { - struct ifreq ifr; - wl_ioctl_t ioc; - mm_segment_t fs; - int ret; - - memset(&ioc, 0, sizeof(ioc)); - ioc.cmd = cmd; - ioc.buf = arg; - ioc.len = len; - - strcpy(ifr.ifr_name, dev->name); - ifr.ifr_data = (caddr_t) &ioc; - - fs = get_fs(); - set_fs(get_ds()); -#if defined(WL_USE_NETDEV_OPS) - ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#else - ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#endif - set_fs(fs); - - return ret; + return wlc_ioctl_internal(dev, cmd, arg, len); } static int diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c --- a/src/wl/sys/wl_linux.c 2015-09-19 00:47:30.000000000 +0200 +++ b/src/wl/sys/wl_linux.c 2020-12-14 13:37:21.522354770 +0100 @@ -45,6 +45,7 @@ #include #include #include +#include #define WLC_MAXBSSCFG 1 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) @@ -93,7 +94,13 @@ #include -static void wl_timer(ulong data); +static void wl_timer( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct timer_list *tl +#else + ulong data +#endif + ); static void _wl_timer(wl_timer_t *t); static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); @@ -117,6 +124,9 @@ typedef struct priv_link { wl_if_t *wlif; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) + unsigned long last_rx; +#endif } priv_link_t; #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) @@ -582,7 +592,7 @@ } wl->bcm_bustype = bustype; - if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { WL_ERROR(("wl%d: ioremap() failed\n", unit)); goto fail; } @@ -772,7 +782,7 @@ if ((val & 0x0000ff00) != 0) pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); bar1_size = pci_resource_len(pdev, 2); - bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), + bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), bar1_size); wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, pdev->irq, bar1_addr, bar1_size); @@ -1643,10 +1653,7 @@ goto done2; } - if (segment_eq(get_fs(), KERNEL_DS)) - buf = ioc.buf; - - else if (ioc.buf) { + if (ioc.buf) { if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) { bcmerror = BCME_NORESOURCE; goto done2; @@ -1667,7 +1674,7 @@ WL_UNLOCK(wl); done1: - if (ioc.buf && (ioc.buf != buf)) { + if (ioc.buf) { if (copy_to_user(ioc.buf, buf, ioc.len)) bcmerror = BCME_BADADDR; MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN)); @@ -1680,6 +1687,39 @@ return (OSL_ERROR(bcmerror)); } +int +wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len) +{ + wl_info_t *wl; + wl_if_t *wlif; + int bcmerror; + + if (!dev) + return -ENETDOWN; + + wl = WL_INFO(dev); + wlif = WL_DEV_IF(dev); + if (wlif == NULL || wl == NULL || wl->dev == NULL) + return -ENETDOWN; + + bcmerror = 0; + + WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd)); + + WL_LOCK(wl); + if (!capable(CAP_NET_ADMIN)) { + bcmerror = BCME_EPERM; + } else { + bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif); + } + WL_UNLOCK(wl); + + ASSERT(VALID_BCMERROR(bcmerror)); + if (bcmerror != 0) + wl->pub->bcmerror = bcmerror; + return (OSL_ERROR(bcmerror)); +} + static struct net_device_stats* wl_get_stats(struct net_device *dev) { @@ -2165,8 +2205,8 @@ wlif = WL_DEV_IF(dev); wl = WL_INFO(dev); + skb->prev = NULL; if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { - skb->prev = NULL; TXQ_LOCK(wl); @@ -2298,9 +2338,19 @@ } static void -wl_timer(ulong data) -{ - wl_timer_t *t = (wl_timer_t *)data; +wl_timer( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct timer_list *tl +#else + ulong data +#endif +) { + wl_timer_t *t = +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + from_timer(t, tl, timer); +#else + (wl_timer_t *)data; +#endif if (!WL_ALL_PASSIVE_ENAB(t->wl)) _wl_timer(t); @@ -2352,9 +2402,13 @@ bzero(t, sizeof(wl_timer_t)); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + timer_setup(&t->timer, wl_timer, 0); +#else init_timer(&t->timer); t->timer.data = (ulong) t; t->timer.function = wl_timer; +#endif t->wl = wl; t->fn = fn; t->arg = arg; @@ -2449,6 +2503,9 @@ { struct sk_buff *oskb = (struct sk_buff *)p; struct sk_buff *skb; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) + priv_link_t *priv_link; +#endif uchar *pdata; uint len; @@ -2915,7 +2972,13 @@ if (skb == NULL) return; skb->dev = wl->monitor_dev; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) + priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); + priv_link = netdev_priv(skb->dev); + priv_link->last_rx = jiffies; +#else skb->dev->last_rx = jiffies; +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) skb_reset_mac_header(skb); #else @@ -3335,10 +3398,16 @@ } #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) static const struct file_operations wl_fops = { .owner = THIS_MODULE, .read = wl_proc_read, .write = wl_proc_write, +#else +static const struct proc_ops wl_fops = { + .proc_read = wl_proc_read, + .proc_write = wl_proc_write, +#endif }; #endif diff -Naur a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h --- a/src/wl/sys/wl_linux.h 2015-09-19 00:47:30.000000000 +0200 +++ b/src/wl/sys/wl_linux.h 2020-12-14 13:37:21.522354770 +0100 @@ -22,6 +22,7 @@ #define _wl_linux_h_ #include +#include typedef struct wl_timer { struct timer_list timer; @@ -187,6 +188,7 @@ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); extern void wl_free(wl_info_t *wl); extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len); extern struct net_device * wl_netdev_get(wl_info_t *wl); #endif