diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 12:37:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:09 -0800 |
| commit | aa0d6c34b6d44dcb14957cb768a13c8e4dd03729 (patch) | |
| tree | 5e5d6def59fafdb225eb7ad41aced24690952135 /drivers/staging/agnx | |
| parent | 40667f32d10c501798fba462ffbb71d3afb5b763 (diff) | |
| download | blackbird-op-linux-aa0d6c34b6d44dcb14957cb768a13c8e4dd03729.tar.gz blackbird-op-linux-aa0d6c34b6d44dcb14957cb768a13c8e4dd03729.zip | |
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 <dreamfly281@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/agnx')
| -rw-r--r-- | drivers/staging/agnx/xmit.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |
