package/hostapd/patches/100-pending_work.patch

   1 --- a/src/ap/ieee802_11.c
   2 +++ b/src/ap/ieee802_11.c
   3 @@ -1488,13 +1488,6 @@ static void handle_assoc_cb(struct hosta
   4         int new_assoc = 1;
   5         struct ieee80211_ht_capabilities ht_cap;
   6
   7 -       if (!ok) {
   8 -               hostapd_logger(hapd, mgmt->da, HOSTAPD_MODULE_IEEE80211,
   9 -                              HOSTAPD_LEVEL_DEBUG,
  10 -                              "did not acknowledge association response");
  11 -               return;
  12 -       }
  13 -
  14         if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_resp) :
  15                                       sizeof(mgmt->u.assoc_resp))) {
  16                 printf("handle_assoc_cb(reassoc=%d) - too short payload "
  17 @@ -1502,11 +1495,6 @@ static void handle_assoc_cb(struct hosta
  18                 return;
  19         }
  20
  21 -       if (reassoc)
  22 -               status = le_to_host16(mgmt->u.reassoc_resp.status_code);
  23 -       else
  24 -               status = le_to_host16(mgmt->u.assoc_resp.status_code);
  25 -
  26         sta = ap_get_sta(hapd, mgmt->da);
  27         if (!sta) {
  28                 printf("handle_assoc_cb: STA " MACSTR " not found\n",
  29 @@ -1514,6 +1502,19 @@ static void handle_assoc_cb(struct hosta
  30                 return;
  31         }
  32
  33 +       if (!ok) {
  34 +               hostapd_logger(hapd, mgmt->da, HOSTAPD_MODULE_IEEE80211,
  35 +                              HOSTAPD_LEVEL_DEBUG,
  36 +                              "did not acknowledge association response");
  37 +               sta->flags &= ~WLAN_STA_ASSOC_REQ_OK;
  38 +               return;
  39 +       }
  40 +
  41 +       if (reassoc)
  42 +               status = le_to_host16(mgmt->u.reassoc_resp.status_code);
  43 +       else
  44 +               status = le_to_host16(mgmt->u.assoc_resp.status_code);
  45 +
  46         if (status != WLAN_STATUS_SUCCESS)
  47                 goto fail;
  48
  49 @@ -1812,6 +1813,9 @@ void ieee802_11_rx_from_unknown(struct h
  50
  51         sta = ap_get_sta(hapd, src);
  52         if (sta && (sta->flags & WLAN_STA_ASSOC)) {
  53 +               if (!hapd->conf->wds_sta)
  54 +                       return;
  55 +
  56                 if (wds && !(sta->flags & WLAN_STA_WDS)) {
  57                         wpa_printf(MSG_DEBUG, "Enable 4-address WDS mode for "
  58                                    "STA " MACSTR " (aid %u)",
  59 --- a/src/drivers/driver_nl80211.c
  60 +++ b/src/drivers/driver_nl80211.c
  61 @@ -2588,10 +2588,10 @@ static int wpa_driver_nl80211_capa(struc
  62         drv->data_tx_status = info.data_tx_status;
  63
  64         /*
  65 -        * If poll command is supported mac80211 is new enough to
  66 -        * have everything we need to not need monitor interfaces.
  67 +        * If poll command and tx status are supported, mac80211 is new enough
  68 +        * to have everything we need to not need monitor interfaces.
  69          */
  70 -       drv->use_monitor = !info.poll_command_supported;
  71 +       drv->use_monitor = !info.poll_command_supported || !info.data_tx_status;
  72
  73         if (drv->device_ap_sme && drv->use_monitor) {
  74                 /*
  75 @@ -6267,8 +6267,8 @@ static int wpa_driver_nl80211_hapd_send_
  76         pos = (u8 *) (hdr + 1);
  77
  78         if (qos) {
  79 -               /* add an empty QoS header if needed */
  80 -               pos[0] = 0;
  81 +               /* Set highest priority in QoS header */
  82 +               pos[0] = 7;
  83                 pos[1] = 0;
  84                 pos += 2;
  85         }
  86 @@ -7533,6 +7533,10 @@ static int i802_set_wds_sta(void *priv,
  87                 linux_set_iface_flags(drv->global->ioctl_sock, name, 1);
  88                 return i802_set_sta_vlan(priv, addr, name, 0);
  89         } else {
  90 +               if (bridge_ifname)
  91 +                       linux_br_del_if(drv->global->ioctl_sock, bridge_ifname,
  92 +                                       name);
  93 +
  94                 i802_set_sta_vlan(priv, addr, bss->ifname, 0);
  95                 return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN,
  96                                                     name);
  97 @@ -7900,7 +7904,12 @@ static int wpa_driver_nl80211_if_remove(
  98         if (ifindex <= 0)
  99                 return -1;
 100
 101 +       nl80211_remove_iface(drv, ifindex);
 102 +
 103  #ifdef HOSTAPD
 104 +       if (type != WPA_IF_AP_BSS)
 105 +               return 0;
 106 +
 107         if (bss->added_if_into_bridge) {
 108                 if (linux_br_del_if(drv->global->ioctl_sock, bss->brname,
 109                                     bss->ifname) < 0)
 110 @@ -7914,13 +7923,6 @@ static int wpa_driver_nl80211_if_remove(
 111                                    "bridge %s: %s",
 112                                    bss->brname, strerror(errno));
 113         }
 114 -#endif /* HOSTAPD */
 115 -
 116 -       nl80211_remove_iface(drv, ifindex);
 117 -
 118 -#ifdef HOSTAPD
 119 -       if (type != WPA_IF_AP_BSS)
 120 -               return 0;
 121
 122         if (bss != &drv->first_bss) {
 123                 struct i802_bss *tbss;