From: Greg Kroah-Hartman Date: Mon, 5 Jan 2009 20:37:19 +0000 (-0800) Subject: Staging: agnx: fix build errors due to rate control API changes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa0d6c34b6d44dcb14957cb768a13c8e4dd03729;p=linux-beck.git Staging: agnx: fix build errors due to rate control API changes In commit e6a9854b05c1a6af1308fe2b8c68f35abf28a3ee, the rate control API was rewritten, so make the needed changes to the agnx driver so that it will build and work properly. Cc: Li YanBo Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/agnx/xmit.c b/drivers/staging/agnx/xmit.c index 42ed7d51b6ed..7f01528b8a46 100644 --- a/drivers/staging/agnx/xmit.c +++ b/drivers/staging/agnx/xmit.c @@ -626,8 +626,8 @@ static inline void fill_agnx_hdr(struct agnx_priv *priv, struct agnx_info *tx_in txhdr->reg0 = cpu_to_be32(reg); /* Set the long and short retry limits */ - txhdr->tx.short_retry_limit = tx_info->txi->control.retry_limit; - txhdr->tx.long_retry_limit = tx_info->txi->control.retry_limit; + txhdr->tx.short_retry_limit = tx_info->txi->control.rates[0].count; + txhdr->tx.long_retry_limit = tx_info->txi->control.rates[0].count; /* FIXME */ len = tx_info->skb->len - sizeof(*txhdr) + tx_info->hdr_len + FCS_LEN; @@ -649,7 +649,7 @@ static void txm_power_set(struct agnx_priv *priv, u32 reg; /* FIXME */ - if (txi->tx_rate_idx < 0) { + if (txi->control.rates[0].idx < 0) { /* For B mode Short Preamble */ reg = agnx_set_bits(PHY_MODE, PHY_MODE_SHIFT, AGNX_MODE_80211B_SHORT); // control->tx_rate = -control->tx_rate;