leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: rxtx remove rate change and current_rate.

Browse Source 
There is no longer any need to change power in vnt_tx_packet.

Remove current_rate in vnt_tx_packet and struct vnt_private as
it is no longer used elsewhere.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/3ba896aa-5ab2-affb-9ce5-7df8a9b3190a@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2020-04-06 20:33:16 +01:00 committed by Greg Kroah-Hartman
parent 463288b981
commit 2da5445be1
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/vt6656/device.h
View File

@ -344,7 +344,6 @@ struct vnt_private {
u8 ofdm_pwr_tbl[14]; u8 ofdm_pwr_tbl[14];
u8 ofdm_a_pwr_tbl[42]; u8 ofdm_a_pwr_tbl[42];
u16 current_rate;
u16 tx_rate_fb0; u16 tx_rate_fb0;
u16 tx_rate_fb1; u16 tx_rate_fb1;

15
drivers/staging/vt6656/rxtx.c
View File

@ -547,7 +547,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
struct vnt_tx_fifo_head *tx_buffer_head; struct vnt_tx_fifo_head *tx_buffer_head;
struct vnt_usb_send_context *tx_context; struct vnt_usb_send_context *tx_context;
unsigned long flags; unsigned long flags;
u16 tx_bytes, tx_header_size, tx_body_size, current_rate, duration_id; u16 tx_bytes, tx_header_size, tx_body_size, duration_id;
u8 pkt_type; u8 pkt_type;
bool need_rts = false; bool need_rts = false;
bool need_mic = false; bool need_mic = false;
@ -556,14 +556,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
rate = ieee80211_get_tx_rate(priv->hw, info); rate = ieee80211_get_tx_rate(priv->hw, info);
current_rate = rate->hw_value; if (rate->hw_value > RATE_11M) {
if (priv->current_rate != current_rate &&
!(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
priv->current_rate = current_rate;
vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
}
if (current_rate > RATE_11M) {
if (info->band == NL80211_BAND_5GHZ) { if (info->band == NL80211_BAND_5GHZ) {
pkt_type = PK_TYPE_11A; pkt_type = PK_TYPE_11A;
} else { } else {
@ -593,7 +586,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
tx_context->pkt_type = pkt_type; tx_context->pkt_type = pkt_type;
tx_context->need_ack = false; tx_context->need_ack = false;
tx_context->frame_len = skb->len + 4; tx_context->frame_len = skb->len + 4;
tx_context->tx_rate = current_rate; tx_context->tx_rate = rate->hw_value;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
@ -666,7 +659,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
tx_context->frame_len += tx_key->icv_len; tx_context->frame_len += tx_key->icv_len;
} }
tx_buffer_head->current_rate = cpu_to_le16(current_rate); tx_buffer_head->current_rate = cpu_to_le16(rate->hw_value);
duration_id = vnt_generate_tx_parameter(tx_context, tx_buffer, &mic_hdr, duration_id = vnt_generate_tx_parameter(tx_context, tx_buffer, &mic_hdr,
need_mic, need_rts); need_mic, need_rts);