Skip to content

Commit

Permalink
Revert "ath9k: export HW random number generator"
Browse files Browse the repository at this point in the history
This reverts commit 6301566. Oleksij Rempel
noticed that the randomness doesn't look to be good enough and Stephan Mueller
commented:

"I would say that the discussed RNG does not seem fit for hooking it up with the
hwrandom framework."

http://lkml.kernel.org/g/3945775.m5HblJPgiO@tauon.atsec.com

So let's the revert the patch until we are sure that we can trust this random
generator.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Kalle Valo committed Jul 31, 2015
1 parent 92ff7a6 commit 360d9bb
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 110 deletions.
7 changes: 0 additions & 7 deletions drivers/net/wireless/ath/ath9k/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,3 @@ config ATH9K_HTC_DEBUGFS
depends on ATH9K_HTC && DEBUG_FS
---help---
Say Y, if you need access to ath9k_htc's statistics.

config ATH9K_HWRNG
bool "Random number generator support"
depends on ATH9K && (HW_RANDOM = y || HW_RANDOM = ATH9K)
default y
---help---
Provides a hardware random number generator to the kernel.
1 change: 0 additions & 1 deletion drivers/net/wireless/ath/ath9k/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o
ath9k-$(CONFIG_ATH9K_TX99) += tx99.o
ath9k-$(CONFIG_ATH9K_WOW) += wow.o
ath9k-$(CONFIG_ATH9K_HWRNG) += rng.o

ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

Expand Down
23 changes: 0 additions & 23 deletions drivers/net/wireless/ath/ath9k/ath9k.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <linux/leds.h>
#include <linux/completion.h>
#include <linux/time.h>
#include <linux/hw_random.h>

#include "common.h"
#include "debug.h"
Expand Down Expand Up @@ -1042,12 +1041,6 @@ struct ath_softc {
u32 wow_intr_before_sleep;
bool force_wow;
#endif

#ifdef CONFIG_ATH9K_HWRNG
struct hwrng rng;
bool rng_initialized;
u32 rng_last;
#endif
};

/********/
Expand All @@ -1070,22 +1063,6 @@ static inline int ath9k_tx99_send(struct ath_softc *sc,
}
#endif /* CONFIG_ATH9K_TX99 */

/***************************/
/* Random Number Generator */
/***************************/
#ifdef CONFIG_ATH9K_HWRNG
void ath9k_rng_register(struct ath_softc *sc);
void ath9k_rng_unregister(struct ath_softc *sc);
#else
static inline void ath9k_rng_register(struct ath_softc *sc)
{
}

static inline void ath9k_rng_unregister(struct ath_softc *sc)
{
}
#endif

static inline void ath_read_cachesize(struct ath_common *common, int *csz)
{
common->bus_ops->read_cachesize(common, csz);
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/wireless/ath/ath9k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,6 @@ static int ath9k_start(struct ieee80211_hw *hw)

ath9k_ps_restore(sc);

ath9k_rng_register(sc);

return 0;
}

Expand Down Expand Up @@ -830,8 +828,6 @@ static void ath9k_stop(struct ieee80211_hw *hw)

ath9k_deinit_channel_context(sc);

ath9k_rng_unregister(sc);

mutex_lock(&sc->mutex);

ath_cancel_work(sc);
Expand Down
75 changes: 0 additions & 75 deletions drivers/net/wireless/ath/ath9k/rng.c

This file was deleted.

0 comments on commit 360d9bb

Please sign in to comment.