package/madwifi: fix r23829 commit

[openwrt.git] / package / hostapd / patches / 453-ap_sta_support.patch

diff --git a/package/hostapd/patches/453-ap_sta_support.patch b/package/hostapd/patches/453-ap_sta_support.patch
index c2f4d7c..930981d 100644 (file)
--- a/package/hostapd/patches/453-ap_sta_support.patch
+++ b/package/hostapd/patches/453-ap_sta_support.patch
@@ -71,8 +71,8 @@
 +              channel = (bss->freq - 5000) / 5;
 +      }
 +
 +              channel = (bss->freq - 5000) / 5;
 +      }
 +

-+      if (asprintf(&cmd, "RELOAD channel=%d sec_chan=0 hw_mode=%d ht_capab_mask=%d ieee80211n=%d",
-+                   channel, hw_mode, bss->ht_capab, !!bss->ht_capab) < 0) {
++      if (asprintf(&cmd, "RELOAD channel=%d sec_chan=0 hw_mode=%d ieee80211n=%d",
++                   channel, hw_mode, !!bss->ht_capab) < 0) {

 +              return -1;
 +      }
 +
 +              return -1;
 +      }
 +


@@ -90,7 +90,7 @@
  /* Configure default/group WEP keys for static WEP */
  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
  {
  /* Configure default/group WEP keys for static WEP */
  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
  {

-@@ -548,6 +597,10 @@ void wpa_supplicant_set_state(struct wpa
+@@ -548,8 +597,16 @@ void wpa_supplicant_set_state(struct wpa

  #ifndef IEEE8021X_EAPOL
                wpa_drv_set_supp_port(wpa_s, 1);
  #endif
  #ifndef IEEE8021X_EAPOL
                wpa_drv_set_supp_port(wpa_s, 1);
  #endif


@@ -100,8 +100,14 @@
 +#endif
        } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
                   state == WPA_ASSOCIATED) {
 +#endif
        } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
                   state == WPA_ASSOCIATED) {

++#ifdef MULTICALL
++              if (wpa_s->hostapd)
++                      hostapd_stop(wpa_s);
++#endif

                wpa_s->new_connection = 1;
                wpa_s->new_connection = 1;

-@@ -1957,6 +2010,21 @@ static int wpa_supplicant_init_iface(str
+               wpa_drv_set_operstate(wpa_s, 0);
+ #ifndef IEEE8021X_EAPOL
+@@ -1957,6 +2014,21 @@ static int wpa_supplicant_init_iface(str

                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
                           sizeof(wpa_s->bridge_ifname));
        }
                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
                           sizeof(wpa_s->bridge_ifname));
        }