package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch

   1 From: Felix Fietkau <nbd@openwrt.org>
   2 Date: Sun, 4 Sep 2011 18:23:36 +0000
   3 Subject: [PATCH] hostapd: add a workaround for driver issues in various
   4  android devices with texas instruments wifi
   5
   6 --- a/src/common/wpa_common.c
   7 +++ b/src/common/wpa_common.c
   8 @@ -2856,6 +2856,31 @@ u32 wpa_akm_to_suite(int akm)
   9  }
  10
  11
  12 +static void wpa_fixup_wpa_ie_rsn(u8 *assoc_ie, const u8 *wpa_msg_ie,
  13 +                                size_t rsn_ie_len)
  14 +{
  15 +       int pos, count;
  16 +
  17 +       pos = sizeof(struct rsn_ie_hdr) + RSN_SELECTOR_LEN;
  18 +       if (rsn_ie_len < pos + 2)
  19 +               return;
  20 +
  21 +       count = WPA_GET_LE16(wpa_msg_ie + pos);
  22 +       pos += 2 + count * RSN_SELECTOR_LEN;
  23 +       if (rsn_ie_len < pos + 2)
  24 +               return;
  25 +
  26 +       count = WPA_GET_LE16(wpa_msg_ie + pos);
  27 +       pos += 2 + count * RSN_SELECTOR_LEN;
  28 +       if (rsn_ie_len < pos + 2)
  29 +               return;
  30 +
  31 +       if (!assoc_ie[pos] && !assoc_ie[pos + 1] &&
  32 +           (wpa_msg_ie[pos] || wpa_msg_ie[pos + 1]))
  33 +               memcpy(&assoc_ie[pos], &wpa_msg_ie[pos], 2);
  34 +}
  35 +
  36 +
  37  int wpa_compare_rsn_ie(int ft_initial_assoc,
  38                        const u8 *ie1, size_t ie1len,
  39                        const u8 *ie2, size_t ie2len)
  40 @@ -2863,8 +2888,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
  41         if (ie1 == NULL || ie2 == NULL)
  42                 return -1;
  43
  44 -       if (ie1len == ie2len && os_memcmp(ie1, ie2, ie1len) == 0)
  45 -               return 0; /* identical IEs */
  46 +       if (ie1len == ie2len) {
  47 +               u8 *ie_tmp;
  48 +
  49 +               if (os_memcmp(ie1, ie2, ie1len) == 0)
  50 +                       return 0; /* identical IEs */
  51 +
  52 +               ie_tmp = alloca(ie1len);
  53 +               memcpy(ie_tmp, ie1, ie1len);
  54 +               wpa_fixup_wpa_ie_rsn(ie_tmp, ie2, ie1len);
  55 +
  56 +               if (os_memcmp(ie_tmp, ie2, ie1len) == 0)
  57 +                       return 0; /* only mismatch in RSN capabilties */
  58 +       }
  59
  60  #ifdef CONFIG_IEEE80211R
  61         if (ft_initial_assoc) {