source: projects/specs/trunk/nonfree/self-build-broadcom-wl/19-linux412.patch @ 11261

Revision 11261, 2.2 KB checked in by ara_t, 6 years ago (diff)

update: self-build-broadcom-wl

RevLine 
[11261]1--- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c.orig        2017-06-26 11:04:47.204814029 +0200
2+++ a/amd64/src/wl/sys/wl_cfg80211_hybrid.c     2017-07-03 09:57:21.343667706 +0200
3@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
4 #endif
5 
6 static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
7-           enum nl80211_iftype type, u32 *flags, struct vif_params *params);
8+           enum nl80211_iftype type,
9+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
10+           u32 *flags,
11+#endif
12+          struct vif_params *params);
13 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
14 static s32
15 wl_cfg80211_scan(struct wiphy *wiphy,
16@@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32
17 
18 static s32
19 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
20-                         enum nl80211_iftype type, u32 *flags,
21-   struct vif_params *params)
22+                         enum nl80211_iftype type,
23+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
24+                         u32 *flags,
25+#endif
26+                         struct vif_params *params)
27 {
28        struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
29        struct wireless_dev *wdev;
30@@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_p
31                     const wl_event_msg_t *e, void *data)
32 {
33        struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
34+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
35+       struct cfg80211_roam_info roam_info = {
36+               .bssid = wl->profile->bssid,
37+               .req_ie = conn_info->req_ie,
38+               .req_ie_len = conn_info->req_ie_len,
39+               .resp_ie = conn_info->resp_ie,
40+               .resp_ie_len = conn_info->resp_ie_len,
41+       };
42+#endif
43        s32 err = 0;
44 
45        err = wl_get_assoc_ies(wl);
46@@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_p
47                return err;
48 
49        cfg80211_roamed(ndev,
50+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
51+                       &roam_info,
52+#else
53 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
54                        &wl->conf->channel,     
55 #endif
56                        (u8 *)&wl->bssid,
57                        conn_info->req_ie, conn_info->req_ie_len,
58-                       conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
59+                       conn_info->resp_ie, conn_info->resp_ie_len,
60+#endif
61+                       GFP_KERNEL);
62        WL_DBG(("Report roaming result\n"));
63 
64        set_bit(WL_STATUS_CONNECTED, &wl->status);
Note: See TracBrowser for help on using the repository browser.