diff options
| author | Malcolm Priestley | 2014-07-20 16:33:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-21 21:16:28 +0200 |
| commit | 93a7355883f87ee16481ae79d7b471752ffb0347 (patch) | |
| tree | c374db179561981e72c4c66f3fa9272afd4b6a45 /drivers/staging/vt6656/card.c | |
| parent | staging: vt6656: struct vnt_private replace byPacketType with packet_type (diff) | |
| download | kernel-qcow2-linux-93a7355883f87ee16481ae79d7b471752ffb0347.tar.gz kernel-qcow2-linux-93a7355883f87ee16481ae79d7b471752ffb0347.tar.xz kernel-qcow2-linux-93a7355883f87ee16481ae79d7b471752ffb0347.zip | |
staging: vt6656: struct vnt_private replace wBasicRate with basic_rates
The same name as in struct ieee80211_bss_conf
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/card.c')
| -rw-r--r-- | drivers/staging/vt6656/card.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 80b2ff88737b..80b67320f626 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -109,7 +109,7 @@ static u16 vnt_get_cck_rate(struct vnt_private *priv, u16 rate_idx) u16 ui = rate_idx; while (ui > RATE_1M) { - if (priv->wBasicRate & (1 << ui)) + if (priv->basic_rates & (1 << ui)) return ui; ui--; } @@ -135,7 +135,7 @@ static u16 vnt_get_ofdm_rate(struct vnt_private *priv, u16 rate_idx) u16 ui = rate_idx; dev_dbg(&priv->usb->dev, "%s basic rate: %d\n", - __func__, priv->wBasicRate); + __func__, priv->basic_rates); if (!vnt_ofdm_min_rate(priv)) { dev_dbg(&priv->usb->dev, "%s (NO OFDM) %d\n", @@ -146,7 +146,7 @@ static u16 vnt_get_ofdm_rate(struct vnt_private *priv, u16 rate_idx) } while (ui > RATE_11M) { - if (priv->wBasicRate & (1 << ui)) { + if (priv->basic_rates & (1 << ui)) { dev_dbg(&priv->usb->dev, "%s rate: %d\n", __func__, ui); return ui; @@ -389,7 +389,7 @@ void vnt_update_ifs(struct vnt_private *priv) priv->difs = C_SIFS_BG + 2 * priv->slot; for (ii = RATE_54M; ii >= RATE_6M; ii--) { - if (priv->wBasicRate & ((u32)(0x1 << ii))) { + if (priv->basic_rates & ((u32)(0x1 << ii))) { ofdm_rate = true; break; } @@ -454,7 +454,7 @@ void vnt_update_top_rates(struct vnt_private *priv) /*Determines the highest basic rate.*/ for (i = RATE_54M; i >= RATE_6M; i--) { - if (priv->wBasicRate & (u16)(1 << i)) { + if (priv->basic_rates & (u16)(1 << i)) { top_ofdm = i; break; } @@ -463,7 +463,7 @@ void vnt_update_top_rates(struct vnt_private *priv) priv->byTopOFDMBasicRate = top_ofdm; for (i = RATE_11M;; i--) { - if (priv->wBasicRate & (u16)(1 << i)) { + if (priv->basic_rates & (u16)(1 << i)) { top_cck = i; break; } @@ -479,7 +479,7 @@ int vnt_ofdm_min_rate(struct vnt_private *priv) int ii; for (ii = RATE_54M; ii >= RATE_6M; ii--) { - if ((priv->wBasicRate) & ((u16)(1 << ii))) + if ((priv->basic_rates) & ((u16)(1 << ii))) return true; } |