hostapd: backport current version from trunk as of r27021

[openwrt-10.03/.git] / package / hostapd / patches / 551-nl80211_del_beacon_bss.patch

diff --git a/package/hostapd/patches/551-nl80211_del_beacon_bss.patch b/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
index 43c550a210b4a533f8c64085adea45c7555aac27..e40c8678d08f08c553c134e47c8acd30c1dffe6d 100644 (file)
--- a/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
+++ b/package/hostapd/patches/551-nl80211_del_beacon_bss.patch
@@ -1,6 +1,6 @@
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -2092,23 +2092,41 @@ wpa_driver_nl80211_finish_drv_init(struc
+@@ -2135,23 +2135,43 @@ wpa_driver_nl80211_finish_drv_init(struc
  }
  
  
@@ -33,18 +33,20 @@
 +
 +      for (bss = &drv->first_bss; bss; bss = bss->next)
 +              wpa_driver_nl80211_del_bss_beacon(bss);
++
++      return 0;
 +}
 +
 +static int wpa_driver_nl80211_stop_ap(void *priv)
 +{
 +      struct i802_bss *bss = priv;
 +
-+      wpa_driver_nl80211_del_beacon(bss->drv);
++      return wpa_driver_nl80211_del_beacon(bss->drv);
 +}
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
-@@ -6566,4 +6584,5 @@ const struct wpa_driver_ops wpa_driver_n
+@@ -6658,4 +6678,5 @@ const struct wpa_driver_ops wpa_driver_n
        .set_intra_bss = nl80211_set_intra_bss,
        .set_param = nl80211_set_param,
        .get_radio_name = nl80211_get_radio_name,
@@ -52,10 +54,10 @@
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
-@@ -2240,6 +2240,8 @@ struct wpa_driver_ops {
-        * @signal_info: Connection info structure
-          */
-       int (*signal_poll)(void *priv, struct wpa_signal_info *signal_info);
+@@ -2253,6 +2253,8 @@ struct wpa_driver_ops {
+        * implementation, there is no need to implement this function.
+        */
+       int (*set_authmode)(void *priv, int authmode);
 +
 +      int (*stop_ap)(void *priv);
  };