wok-current view broadcom-wl-pae/stuff/007-linux412.patch @ rev 25694

Fix cifs-utils, up grub2-efi-x64 stuff for iso EFI
author Stanislas Leduc <shann@slitaz.org>
date Sat Mar 30 18:05:22 2024 +0000 (3 months ago)
parents
children
line source
1 From 0b888bf115612074df99654140a1980111c29748 Mon Sep 17 00:00:00 2001
2 From: Antoine Cotten <tonio.cotten@gmail.com>
3 Date: Fri, 7 Jul 2017 15:17:47 +0200
4 Subject: [PATCH] Apply patch from Debian bug #867258
5
6 Compile fix with kernel 4.12
7 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867258
8 ---
9 src/wl/sys/wl_cfg80211_hybrid.c | 29 +++++++++++++++++++++++++----
10 1 file changed, 25 insertions(+), 4 deletions(-)
11
12 diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
13 index c46944a..1a9840a 100644
14 --- a/src/wl/sys/wl_cfg80211_hybrid.c
15 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
16 @@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
17 #endif
18
19 static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
20 - enum nl80211_iftype type, u32 *flags, struct vif_params *params);
21 + enum nl80211_iftype type,
22 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
23 + u32 *flags,
24 +#endif
25 + struct vif_params *params);
26 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
27 static s32
28 wl_cfg80211_scan(struct wiphy *wiphy,
29 @@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
30
31 static s32
32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
33 - enum nl80211_iftype type, u32 *flags,
34 - struct vif_params *params)
35 + enum nl80211_iftype type,
36 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
37 + u32 *flags,
38 +#endif
39 + struct vif_params *params)
40 {
41 struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
42 struct wireless_dev *wdev;
43 @@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
44 const wl_event_msg_t *e, void *data)
45 {
46 struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
47 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
48 + struct cfg80211_roam_info roam_info = {
49 + .bssid = wl->profile->bssid,
50 + .req_ie = conn_info->req_ie,
51 + .req_ie_len = conn_info->req_ie_len,
52 + .resp_ie = conn_info->resp_ie,
53 + .resp_ie_len = conn_info->resp_ie_len,
54 + };
55 +#endif
56 s32 err = 0;
57
58 err = wl_get_assoc_ies(wl);
59 @@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
60 return err;
61
62 cfg80211_roamed(ndev,
63 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
64 + &roam_info,
65 +#else
66 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
67 &wl->conf->channel,
68 #endif
69 (u8 *)&wl->bssid,
70 conn_info->req_ie, conn_info->req_ie_len,
71 - conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
72 + conn_info->resp_ie, conn_info->resp_ie_len,
73 +#endif
74 + GFP_KERNEL);
75 WL_DBG(("Report roaming result\n"));
76
77 set_bit(WL_STATUS_CONNECTED, &wl->status);
78