wok annotate broadcom-wl/stuff/3.6.0.patch @ rev 20497

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