hostapd: update to latest trunk version (merge r26414, r26415)

[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 bd71a7bafdc47787db68195848e22a90a429f183..43c550a210b4a533f8c64085adea45c7555aac27 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
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c

-@@ -2065,23 +2065,41 @@ wpa_driver_nl80211_finish_drv_init(struc
+@@ -2092,23 +2092,41 @@ wpa_driver_nl80211_finish_drv_init(struc

  }
  
  
  }
  
  


@@ -44,7 +44,7 @@
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface

-@@ -6529,4 +6547,5 @@ const struct wpa_driver_ops wpa_driver_n
+@@ -6566,4 +6584,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,
        .set_intra_bss = nl80211_set_intra_bss,
        .set_param = nl80211_set_param,
        .get_radio_name = nl80211_get_radio_name,


@@ -52,10 +52,10 @@
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h

-@@ -2217,6 +2217,8 @@ struct wpa_driver_ops {
-                             const u8 *buf, size_t len);
- 
-       int (*tdls_oper)(void *priv, enum tdls_oper oper, const u8 *peer);
+@@ -2240,6 +2240,8 @@ struct wpa_driver_ops {
+        * @signal_info: Connection info structure
+          */
+       int (*signal_poll)(void *priv, struct wpa_signal_info *signal_info);

 +
 +      int (*stop_ap)(void *priv);
  };
 +
 +      int (*stop_ap)(void *priv);
  };