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