wok-current view broadcom-wl/stuff/3.6.0.patch @ rev 23506

updated python-markupsafe (0.12 -> 1.1.1)
author Hans-G?nter Theisgen
date Mon Apr 06 09:22:36 2020 +0100 (2020-04-06)
parents
children
line source
1 Description: Fix kernel oops with 3.6 and newer kernels
2 Author: Cyril Lacoux <clacoux@easter-eggs.com>
3 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698216
4 Last-Update: 2013-24-01
5
6 --- a/amd64/src/wl/sys/wl_cfg80211.c
7 +++ b/amd64/src/wl/sys/wl_cfg80211.c
8 @@ -42,8 +42,12 @@
9 enum nl80211_iftype type, u32 *flags, struct vif_params *params);
10 static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
11 struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
12 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
13 +static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request);
14 +#else
15 static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
16 struct cfg80211_scan_request *request);
17 +#endif
18 static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
19 static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
20 struct cfg80211_ibss_params *params);
21 @@ -570,10 +574,18 @@
22 }
23
24 static s32
25 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
26 +wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
27 +#else
28 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
29 struct cfg80211_scan_request *request)
30 +#endif
31 {
32 s32 err = 0;
33 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
34 + struct wl_priv *wl = wiphy_to_wl(wiphy);
35 + struct net_device *ndev = wl_to_ndev(wl);
36 +#endif
37
38 CHECK_SYS_UP();
39 err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);