git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001
   2 From: Jouni Malinen <j@w1.fi>
   3 Date: Mon, 3 Dec 2018 12:00:26 +0200
   4 Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y
   5
   6 remove_ie() was defined within an ifdef CONFIG_FILS block while it is
   7 now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition
   8 there.
   9
  10 Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol")
  11 Signed-off-by: Jouni Malinen <j@w1.fi>
  12 ---
  13  wpa_supplicant/sme.c | 2 --
  14  1 file changed, 2 deletions(-)
  15
  16 --- a/wpa_supplicant/sme.c
  17 +++ b/wpa_supplicant/sme.c
  18 @@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplican
  19  }
  20
  21
  22 -#ifdef CONFIG_FILS
  23  #ifdef CONFIG_IEEE80211R
  24  static void remove_ie(u8 *buf, size_t *len, u8 eid)
  25  {
  26 @@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *l
  27         }
  28  }
  29  #endif /* CONFIG_IEEE80211R */
  30 -#endif /* CONFIG_FILS */
  31
  32
  33  void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,