| Message ID | 1535788107-171830-1-git-send-email-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ec7eccf7ad1cd5f13614e77f59c87fe1f37bf56c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v4] rsi: remove set but not used variables 'header_size' and 'tx_params' | expand |
YueHaibing <yuehaibing@huawei.com> wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/wireless/rsi/rsi_91x_hal.c: In function 'rsi_send_data_pkt': > drivers/net/wireless/rsi/rsi_91x_hal.c:288:5: warning: > variable 'header_size' set but not used [-Wunused-but-set-variable] > > 'tx_params' only used for 'header_size' dereferenced,so also > can be removed. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Patch applied to wireless-drivers-next.git, thanks. ec7eccf7ad1c rsi: remove set but not used variables 'header_size' and 'tx_params'
diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c index 01edf96..182b066 100644 --- a/drivers/net/wireless/rsi/rsi_91x_hal.c +++ b/drivers/net/wireless/rsi/rsi_91x_hal.c @@ -282,10 +282,8 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) struct rsi_hw *adapter = common->priv; struct ieee80211_vif *vif; struct ieee80211_tx_info *info; - struct skb_info *tx_params; struct ieee80211_bss_conf *bss; int status = -EINVAL; - u8 header_size; if (!skb) return 0; @@ -297,8 +295,6 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) goto err; vif = info->control.vif; bss = &vif->bss_conf; - tx_params = (struct skb_info *)info->driver_data; - header_size = tx_params->internal_hdr_size; if (((vif->type == NL80211_IFTYPE_STATION) || (vif->type == NL80211_IFTYPE_P2P_CLIENT)) &&
Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/wireless/rsi/rsi_91x_hal.c: In function 'rsi_send_data_pkt': drivers/net/wireless/rsi/rsi_91x_hal.c:288:5: warning: variable 'header_size' set but not used [-Wunused-but-set-variable] 'tx_params' only used for 'header_size' dereferenced,so also can be removed. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- v4:add missing changlog,also wipe a messy code in commit log v3:fix patch title as Siva Rebbagondla suggested v2:remove unused 'tx_params' --- drivers/net/wireless/rsi/rsi_91x_hal.c | 4 ---- 1 file changed, 4 deletions(-)