19-linux412.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  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. static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
  6. - enum nl80211_iftype type, u32 *flags, struct vif_params *params);
  7. + enum nl80211_iftype type,
  8. +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
  9. + u32 *flags,
  10. +#endif
  11. + struct vif_params *params);
  12. #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
  13. static s32
  14. wl_cfg80211_scan(struct wiphy *wiphy,
  15. @@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32
  16. static s32
  17. wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
  18. - enum nl80211_iftype type, u32 *flags,
  19. - struct vif_params *params)
  20. + enum nl80211_iftype type,
  21. +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
  22. + u32 *flags,
  23. +#endif
  24. + struct vif_params *params)
  25. {
  26. struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
  27. struct wireless_dev *wdev;
  28. @@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_p
  29. const wl_event_msg_t *e, void *data)
  30. {
  31. struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
  32. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  33. + struct cfg80211_roam_info roam_info = {
  34. + .bssid = wl->profile->bssid,
  35. + .req_ie = conn_info->req_ie,
  36. + .req_ie_len = conn_info->req_ie_len,
  37. + .resp_ie = conn_info->resp_ie,
  38. + .resp_ie_len = conn_info->resp_ie_len,
  39. + };
  40. +#endif
  41. s32 err = 0;
  42. err = wl_get_assoc_ies(wl);
  43. @@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_p
  44. return err;
  45. cfg80211_roamed(ndev,
  46. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  47. + &roam_info,
  48. +#else
  49. #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
  50. &wl->conf->channel,
  51. #endif
  52. (u8 *)&wl->bssid,
  53. conn_info->req_ie, conn_info->req_ie_len,
  54. - conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
  55. + conn_info->resp_ie, conn_info->resp_ie_len,
  56. +#endif
  57. + GFP_KERNEL);
  58. WL_DBG(("Report roaming result\n"));
  59. set_bit(WL_STATUS_CONNECTED, &wl->status);