wok diff broadcom-wl64/stuff/3.6.0.patch @ rev 20901

updated expect (5.45 -> 5.45.4)
author Hans-G?nter Theisgen
date Tue Feb 26 17:33:50 2019 +0100 (2019-02-26)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/broadcom-wl64/stuff/3.6.0.patch	Tue Feb 26 17:33:50 2019 +0100
     1.3 @@ -0,0 +1,39 @@
     1.4 +Description: Fix kernel oops with 3.6 and newer kernels
     1.5 +Author: Cyril Lacoux <clacoux@easter-eggs.com>
     1.6 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698216
     1.7 +Last-Update: 2013-24-01
     1.8 +
     1.9 +--- a/amd64/src/wl/sys/wl_cfg80211.c
    1.10 ++++ b/amd64/src/wl/sys/wl_cfg80211.c
    1.11 +@@ -42,8 +42,12 @@
    1.12 +            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
    1.13 + static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
    1.14 +            struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
    1.15 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
    1.16 ++static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request);
    1.17 ++#else
    1.18 + static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
    1.19 +            struct cfg80211_scan_request *request);
    1.20 ++#endif
    1.21 + static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
    1.22 + static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
    1.23 +            struct cfg80211_ibss_params *params);
    1.24 +@@ -570,10 +574,18 @@
    1.25 + }
    1.26 + 
    1.27 + static s32
    1.28 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
    1.29 ++wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
    1.30 ++#else
    1.31 + wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
    1.32 +                  struct cfg80211_scan_request *request)
    1.33 ++#endif
    1.34 + {
    1.35 + 	s32 err = 0;
    1.36 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
    1.37 ++    struct wl_priv *wl = wiphy_to_wl(wiphy);
    1.38 ++    struct net_device *ndev = wl_to_ndev(wl);
    1.39 ++#endif
    1.40 + 
    1.41 + 	CHECK_SYS_UP();
    1.42 + 	err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);