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

[openwrt.git] / package / hostapd / patches / 700-random_pool_add_kernel.patch

diff --git a/package/hostapd/patches/700-random_pool_add_kernel.patch b/package/hostapd/patches/700-random_pool_add_kernel.patch
index 8ba40e5..bf95848 100644 (file)
--- a/package/hostapd/patches/700-random_pool_add_kernel.patch
+++ b/package/hostapd/patches/700-random_pool_add_kernel.patch
@@ -27,7 +27,7 @@
  {
        struct os_time t;
        static unsigned int count = 0;
  {
        struct os_time t;
        static unsigned int count = 0;

-@@ -191,9 +195,13 @@ int random_get_bytes(void *buf, size_t l
+@@ -191,16 +195,22 @@ int random_get_bytes(void *buf, size_t l

  int random_pool_ready(void)
  {
  #ifdef __linux__
  int random_pool_ready(void)
  {
  #ifdef __linux__


@@ -41,7 +41,37 @@
        /*
         * Make sure that there is reasonable entropy available before allowing
         * some key derivation operations to proceed.
        /*
         * Make sure that there is reasonable entropy available before allowing
         * some key derivation operations to proceed.

-@@ -258,9 +266,15 @@ int random_pool_ready(void)
+        */
+ 
+-      if (dummy_key_avail == sizeof(dummy_key))
++      if (dummy_key_avail == sizeof(dummy_key)) {
++              random_mark_pool_ready();
+               return 1; /* Already initialized - good to continue */
++      }
+ 
+       /*
+        * Try to fetch some more data from the kernel high quality
+@@ -232,8 +242,10 @@ int random_pool_ready(void)
+       dummy_key_avail += res;
+       close(fd);
+ 
+-      if (dummy_key_avail == sizeof(dummy_key))
++      if (dummy_key_avail == sizeof(dummy_key)) {
++              random_mark_pool_ready();
+               return 1;
++      }
+ 
+       wpa_printf(MSG_INFO, "random: Only %u/%u bytes of strong "
+                  "random data available from /dev/random",
+@@ -243,6 +255,7 @@ int random_pool_ready(void)
+           total_collected + 10 * own_pool_ready > MIN_COLLECT_ENTROPY) {
+               wpa_printf(MSG_INFO, "random: Allow operation to proceed "
+                          "based on internal entropy");
++              random_mark_pool_ready();
+               return 1;
+       }
+ 
+@@ -258,9 +271,15 @@ int random_pool_ready(void)

  
  void random_mark_pool_ready(void)
  {
  
  void random_mark_pool_ready(void)
  {


@@ -57,7 +87,7 @@
  }
  
  
  }
  
  

-@@ -335,3 +349,22 @@ void random_deinit(void)
+@@ -335,3 +354,22 @@ void random_deinit(void)

        random_close_fd();
  #endif /* __linux__ */
  }
        random_close_fd();
  #endif /* __linux__ */
  }


@@ -111,7 +141,7 @@
  ifeq ($(CONFIG_CTRL_IFACE), y)
 --- a/wpa_supplicant/Android.mk
 +++ b/wpa_supplicant/Android.mk
  ifeq ($(CONFIG_CTRL_IFACE), y)
 --- a/wpa_supplicant/Android.mk
 +++ b/wpa_supplicant/Android.mk

-@@ -1102,9 +1102,8 @@ endif
+@@ -1109,9 +1109,8 @@ endif

  
  ifdef CONFIG_NO_RANDOM_POOL
  L_CFLAGS += -DCONFIG_NO_RANDOM_POOL
  
  ifdef CONFIG_NO_RANDOM_POOL
  L_CFLAGS += -DCONFIG_NO_RANDOM_POOL