kernel: update ssb and bcma to linux-next next-20110627

[openwrt.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 1d08b93..e40c867 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

-@@ -1897,23 +1897,41 @@ wpa_driver_nl80211_finish_drv_init(struc
+@@ -2135,23 +2135,43 @@ wpa_driver_nl80211_finish_drv_init(struc

  }
  
  
  }
  
  


@@ -33,29 +33,31 @@
 +
 +      for (bss = &drv->first_bss; bss; bss = bss->next)
 +              wpa_driver_nl80211_del_bss_beacon(bss);
 +
 +      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;
 +
 +}
 +
 +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
 +}
  
  /**
   * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface

-@@ -5905,4 +5923,5 @@ const struct wpa_driver_ops wpa_driver_n
-       .signal_monitor = nl80211_signal_monitor,
-       .send_frame = nl80211_send_frame,
+@@ -6658,4 +6678,5 @@ const struct wpa_driver_ops wpa_driver_n

        .set_intra_bss = nl80211_set_intra_bss,
        .set_intra_bss = nl80211_set_intra_bss,

+       .set_param = nl80211_set_param,
+       .get_radio_name = nl80211_get_radio_name,

 +      .stop_ap = wpa_driver_nl80211_stop_ap,
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
 +      .stop_ap = wpa_driver_nl80211_stop_ap,
  };
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h

-@@ -1915,6 +1915,8 @@ struct wpa_driver_ops {
-        * set_intra_bss - Enables/Disables intra BSS bridging
+@@ -2253,6 +2253,8 @@ struct wpa_driver_ops {
+        * implementation, there is no need to implement this function.

         */
         */

-       int (*set_intra_bss)(void *priv, int enabled);
+       int (*set_authmode)(void *priv, int authmode);

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