Commit d6ff1b52 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman

staging: vt6655: remove some redundant variables

Variables rx_sts, sq, frame and is_pspoll are being assigned but are
never used hence they are redundant and can be removed.

Cleans up clang warnings:
warning: variable 'sq' set but not used [-Wunused-but-set-variable]
warning: variable 'rx_sts' set but not used [-Wunused-but-set-variable]
warning: variable 'frame' set but not used [-Wunused-but-set-variable]
warning: variable 'is_pspoll' set but not used [-Wunused-but-set-variable]
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e63a46fa
...@@ -34,7 +34,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb, ...@@ -34,7 +34,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,
__le64 *tsf_time; __le64 *tsf_time;
u16 frame_size; u16 frame_size;
int ii, r; int ii, r;
u8 *rx_sts, *rx_rate, *sq; u8 *rx_rate;
u8 *skb_data; u8 *skb_data;
u8 rate_idx = 0; u8 rate_idx = 0;
u8 rate[MAX_RATE] = {2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108}; u8 rate[MAX_RATE] = {2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108};
...@@ -49,7 +49,6 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb, ...@@ -49,7 +49,6 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,
skb_data = (u8 *)skb->data; skb_data = (u8 *)skb->data;
rx_sts = skb_data;
rx_rate = skb_data + 1; rx_rate = skb_data + 1;
sband = hw->wiphy->bands[hw->conf.chandef.chan->band]; sband = hw->wiphy->bands[hw->conf.chandef.chan->band];
...@@ -74,7 +73,6 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb, ...@@ -74,7 +73,6 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,
} }
tsf_time = (__le64 *)(skb_data + bytes_received - 12); tsf_time = (__le64 *)(skb_data + bytes_received - 12);
sq = skb_data + bytes_received - 4;
new_rsr = skb_data + bytes_received - 3; new_rsr = skb_data + bytes_received - 3;
rssi = skb_data + bytes_received - 2; rssi = skb_data + bytes_received - 2;
rsr = skb_data + bytes_received - 1; rsr = skb_data + bytes_received - 1;
......
...@@ -32,7 +32,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, ...@@ -32,7 +32,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
struct ieee80211_rx_status rx_status = { 0 }; struct ieee80211_rx_status rx_status = { 0 };
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
__le16 fc; __le16 fc;
u8 *rsr, *new_rsr, *rssi, *frame; u8 *rsr, *new_rsr, *rssi;
__le64 *tsf_time; __le64 *tsf_time;
u32 frame_size; u32 frame_size;
int ii, r; int ii, r;
...@@ -133,8 +133,6 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, ...@@ -133,8 +133,6 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb,
priv->bb_pre_ed_rssi = (u8)rx_dbm + 1; priv->bb_pre_ed_rssi = (u8)rx_dbm + 1;
priv->current_rssi = priv->bb_pre_ed_rssi; priv->current_rssi = priv->bb_pre_ed_rssi;
frame = skb_data + 8;
skb_pull(skb, 8); skb_pull(skb, 8);
skb_trim(skb, frame_size); skb_trim(skb, frame_size);
......
...@@ -797,7 +797,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -797,7 +797,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
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, current_rate, duration_id;
u8 pkt_type, fb_option = AUTO_FB_NONE; u8 pkt_type, fb_option = AUTO_FB_NONE;
bool need_rts = false, is_pspoll = false; bool need_rts = false;
bool need_mic = false; bool need_mic = false;
hdr = (struct ieee80211_hdr *)(skb->data); hdr = (struct ieee80211_hdr *)(skb->data);
...@@ -888,9 +888,6 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -888,9 +888,6 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
if (ieee80211_has_a4(hdr->frame_control)) if (ieee80211_has_a4(hdr->frame_control))
tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_LHEAD); tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_LHEAD);
if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
is_pspoll = true;
tx_buffer_head->frag_ctl = tx_buffer_head->frag_ctl =
cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb) << 10); cpu_to_le16(ieee80211_get_hdrlen_from_skb(skb) << 10);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment