package/kernel/rtl8812au-ct/patches/100-api_update.patch

   1 --- a/os_dep/linux/ioctl_cfg80211.c
   2 +++ b/os_dep/linux/ioctl_cfg80211.c
   3 @@ -798,8 +798,8 @@ check_bss:
   4
   5                 DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
   6  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
   7 -               roam_info.channel = notify_channel;
   8 -               roam_info.bssid = cur_network->network.MacAddress;
   9 +               roam_info.links[0].channel = notify_channel;
  10 +               roam_info.links[0].bssid = cur_network->network.MacAddress;
  11                 roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
  12                 roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
  13                 roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;
  14 @@ -1389,6 +1389,7 @@ exit:
  15
  16  static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
  17  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  18 +                                int link_id,
  19                                  u8 key_index, bool pairwise, const u8 *mac_addr,
  20  #else  // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  21                                  u8 key_index, const u8 *mac_addr,
  22 @@ -1529,6 +1530,7 @@ addkey_end:
  23
  24  static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
  25  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  26 +                                int link_id,
  27                                  u8 key_index, bool pairwise, const u8 *mac_addr,
  28  #else  // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  29                                  u8 key_index, const u8 *mac_addr,
  30 @@ -1562,6 +1564,7 @@ static int cfg80211_rtw_get_key(struct w
  31
  32  static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
  33  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  34 +                                int link_id,
  35                                  u8 key_index, bool pairwise, const u8 *mac_addr)
  36  #else  // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  37                                  u8 key_index, const u8 *mac_addr)
  38 @@ -1581,7 +1584,7 @@ static int cfg80211_rtw_del_key(struct w
  39  }
  40
  41  static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
  42 -                                        struct net_device *ndev, u8 key_index
  43 +                                        struct net_device *ndev, int link_id, u8 key_index
  44  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE)
  45                                          , bool unicast, bool multicast
  46  #endif
  47 @@ -4019,7 +4022,8 @@ static int cfg80211_rtw_change_beacon(st
  48         return ret;
  49  }
  50
  51 -static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
  52 +static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
  53 +                               unsigned int link_id)
  54  {
  55         DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
  56         return 0;