100-api_update.patch 3.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182
  1. --- a/os_dep/linux/ioctl_cfg80211.c
  2. +++ b/os_dep/linux/ioctl_cfg80211.c
  3. @@ -798,8 +798,8 @@ check_bss:
  4. DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
  5. #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  6. - roam_info.channel = notify_channel;
  7. - roam_info.bssid = cur_network->network.MacAddress;
  8. + roam_info.links[0].channel = notify_channel;
  9. + roam_info.links[0].bssid = cur_network->network.MacAddress;
  10. roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
  11. roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
  12. roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;
  13. @@ -1389,6 +1389,7 @@ exit:
  14. static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
  15. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  16. + int link_id,
  17. u8 key_index, bool pairwise, const u8 *mac_addr,
  18. #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  19. u8 key_index, const u8 *mac_addr,
  20. @@ -1529,6 +1530,7 @@ addkey_end:
  21. static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
  22. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  23. + int link_id,
  24. u8 key_index, bool pairwise, const u8 *mac_addr,
  25. #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  26. u8 key_index, const u8 *mac_addr,
  27. @@ -1562,6 +1564,7 @@ static int cfg80211_rtw_get_key(struct w
  28. static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
  29. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  30. + int link_id,
  31. u8 key_index, bool pairwise, const u8 *mac_addr)
  32. #else // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  33. u8 key_index, const u8 *mac_addr)
  34. @@ -1581,7 +1584,7 @@ static int cfg80211_rtw_del_key(struct w
  35. }
  36. static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
  37. - struct net_device *ndev, u8 key_index
  38. + struct net_device *ndev, int link_id, u8 key_index
  39. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE)
  40. , bool unicast, bool multicast
  41. #endif
  42. @@ -2349,7 +2352,7 @@ exit:
  43. }
  44. -static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
  45. +static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed)
  46. {
  47. #if 0
  48. struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
  49. @@ -3142,6 +3145,7 @@ static int cfg80211_rtw_set_txpower(stru
  50. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
  51. struct wireless_dev *wdev,
  52. #endif
  53. + int radio_idx,
  54. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) || defined(COMPAT_KERNEL_RELEASE)
  55. enum nl80211_tx_power_setting type, int mbm)
  56. #else
  57. @@ -3180,7 +3184,7 @@ static int cfg80211_rtw_set_txpower(stru
  58. static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
  59. #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
  60. - struct wireless_dev *wdev,
  61. + struct wireless_dev *wdev, int radio_idx,
  62. #endif
  63. int *dbm)
  64. {
  65. @@ -4031,7 +4035,8 @@ static int cfg80211_rtw_change_beacon(st
  66. return ret;
  67. }
  68. -static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
  69. +static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
  70. + unsigned int link_id)
  71. {
  72. DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
  73. return 0;