From 6ca7b75830e9778f178db6d9c5abab2faaa90e48 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 16 Feb 2012 22:14:45 -0500 Subject: [PATCH] --- yaml --- r: 290695 b: refs/heads/master c: a39fb224b49c5aebb40c4d5c9d6ccf3a951053ee h: refs/heads/master i: 290693: 4be9f1dfb9f8f0143bc31a53b458cca23db4722f 290691: bc7d3975d6a22964698e41c37f63367591115f2c 290687: 9abc20e5497f7a49025740392c0f6f41a5bbc8b9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/rc.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a98a6c3cc6de..5d83fbc92a2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e3c3b88a9c743cb9ddd65eb1cdd15ade25abfb4 +refs/heads/master: a39fb224b49c5aebb40c4d5c9d6ccf3a951053ee diff --git a/trunk/drivers/net/wireless/ath/ath9k/rc.c b/trunk/drivers/net/wireless/ath/ath9k/rc.c index a427a16bb739..b8c6c38cbb98 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/rc.c +++ b/trunk/drivers/net/wireless/ath/ath9k/rc.c @@ -567,10 +567,8 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv, static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv, const struct ath_rate_table *rate_table, - u8 *mcs_set, u32 capflag) + struct ath_rateset *rateset, u32 capflag) { - struct ath_rateset *rateset = (struct ath_rateset *)mcs_set; - u8 i, j, hi = 0; /* Use intersection of working rates and valid rates */ @@ -1212,7 +1210,7 @@ static void ath_rc_init(struct ath_softc *sc, { struct ath_rateset *rateset = &ath_rc_priv->neg_rates; struct ath_common *common = ath9k_hw_common(sc->sc_ah); - u8 *ht_mcs = (u8 *)&ath_rc_priv->neg_ht_rates; + struct ath_rateset *ht_mcs = &ath_rc_priv->neg_ht_rates; u8 i, j, k, hi = 0, hthi = 0; /* Initial rate table size. Will change depending