tjh.dev
1diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
2index 711b771..5a2636a 100644
3--- a/src/shared/linux_osl.c
4+++ b/src/shared/linux_osl.c
5@@ -1105,7 +1105,7 @@ osl_os_get_image_block(char *buf, int len, void *image)
6 if (!image)
7 return 0;
8
9- rdlen = kernel_read(fp, fp->f_pos, buf, len);
10+ rdlen = kernel_read(fp, (void *)fp->f_pos, (size_t)len, (loff_t *)buf);
11 if (rdlen > 0)
12 fp->f_pos += rdlen;
13
14diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
15index 2b3c290..093dce6 100644
16--- a/src/wl/sys/wl_cfg80211_hybrid.c
17+++ b/src/wl/sys/wl_cfg80211_hybrid.c
18@@ -790,6 +790,7 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
19 break;
20 case NL80211_AUTHTYPE_NETWORK_EAP:
21 WL_DBG(("network eap\n"));
22+ break;
23 default:
24 val = 2;
25 WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
26@@ -2347,26 +2348,24 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
27 const wl_event_msg_t *e, void *data)
28 {
29 struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
30+ s32 err = 0;
31 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
32 struct cfg80211_bss *bss;
33 struct wlc_ssid *ssid;
34+ struct cfg80211_roam_info roam_info;
35 ssid = &wl->profile->ssid;
36 bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
37 ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
38- struct cfg80211_roam_info roam_info = {
39 // Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8)
40 #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
41- .bss = bss,
42+ roam_info.bss = bss;
43 #else
44- .links[0].bss = bss,
45+ roam_info.links[0].bss = bss;
46 #endif
47- .req_ie = conn_info->req_ie,
48- .req_ie_len = conn_info->req_ie_len,
49- .resp_ie = conn_info->resp_ie,
50- .resp_ie_len = conn_info->resp_ie_len,
51- };
52+ roam_info.req_ie = conn_info->req_ie;
53+ roam_info.req_ie_len = conn_info->req_ie_len;
54+ roam_info.resp_ie = conn_info->resp_ie;
55 #endif
56- s32 err = 0;
57
58 wl_get_assoc_ies(wl);
59 memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
60diff --git a/src/wl/sys/wl_iw.h b/src/wl/sys/wl_iw.h
61index 3ab084f..471d11f 100644
62--- a/src/wl/sys/wl_iw.h
63+++ b/src/wl/sys/wl_iw.h
64@@ -70,7 +70,6 @@ struct cntry_locales_custom {
65 #define WL_IW_RSSI_EXCELLENT -57
66 #define WL_IW_RSSI_INVALID 0
67 #define MAX_WX_STRING 80
68-#define isprint(c) bcm_isprint(c)
69 #define WL_IW_SET_ACTIVE_SCAN (SIOCIWFIRSTPRIV+1)
70 #define WL_IW_GET_RSSI (SIOCIWFIRSTPRIV+3)
71 #define WL_IW_SET_PASSIVE_SCAN (SIOCIWFIRSTPRIV+5)
72diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
73index d13fb98..97ae2a6 100644
74--- a/src/wl/sys/wl_linux.c
75+++ b/src/wl/sys/wl_linux.c
76@@ -797,14 +797,15 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
77 pci_read_config_dword(pdev, 0x40, &val);
78 if ((val & 0x0000ff00) != 0)
79 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
80- bar1_size = pci_resource_len(pdev, 2);
81- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
82- bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
83- bar1_size);
84- #else
85- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
86- bar1_size);
87- #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
88+
89+ bar1_size = pci_resource_len(pdev, 2);
90+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
91+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2),
92+ bar1_size);
93+ #else
94+ bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2),
95+ bar1_size);
96+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */
97 wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev,
98 pdev->irq, bar1_addr, bar1_size);
99