| Message ID | 20161126021158.GA12838@box64.home.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c06696a9582098e4e12b027effa405135f79aaa5 |
| Delegated to: | Kalle Valo |
| Headers | show |
Barry Day <briselec@gmail.com> wrote: > Move the dev_info call that attempts to show the rate used before it is set. > > Signed-off-by: Barry Day <briselec@gmail.com> Jes, I would like to take this directly to fix the compiler warning. Also I'll change the commit log to: rtl8xxxu: tx rate reported before set Move the dev_info call that attempts to show the rate used before it is set. Fixes a compiler warning: drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c: In function 'rtl8xxxu_fill_txdesc_v2': include/linux/device.h:1214:36: warning: 'rate' may be used uninitialized in this function [-Wmaybe-uninitialized] #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) Fixes: b4c3d9cfb607 ("rtl8xxxu: Pass tx_info to fill_txdesc in order to have access to retry count") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Barry Day <briselec@gmail.com>
Kalle Valo <kvalo@codeaurora.org> writes: > Barry Day <briselec@gmail.com> wrote: >> Move the dev_info call that attempts to show the rate used before it is set. >> >> Signed-off-by: Barry Day <briselec@gmail.com> > > Jes, I would like to take this directly to fix the compiler warning. Also I'll > change the commit log to: Kalle, I'm totally fine with this, please go ahead. Barry thanks for fixing this. Cheers, Jes > rtl8xxxu: tx rate reported before set > > Move the dev_info call that attempts to show the rate used before it is set. > Fixes a compiler warning: > > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c: In function > 'rtl8xxxu_fill_txdesc_v2': > include/linux/device.h:1214:36: warning: 'rate' may be used > uninitialized in this function [-Wmaybe-uninitialized] > #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) > > Fixes: b4c3d9cfb607 ("rtl8xxxu: Pass tx_info to fill_txdesc in order > to have access to retry count") > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Barry Day <briselec@gmail.com>
Barry Day <briselec@gmail.com> wrote: > Move the dev_info call that attempts to show the rate used before it is set. > > Signed-off-by: Barry Day <briselec@gmail.com> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Barry Day <briselec@gmail.com> Patch applied to wireless-drivers-next.git, thanks. c06696a95820 rtl8xxxu: tx rate reported before set
diff --git a/rtl8xxxu_core.c b/rtl8xxxu_core.c index 04141e5..a9137ab 100644 --- a/rtl8xxxu_core.c +++ b/rtl8xxxu_core.c @@ -4844,16 +4844,16 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, tx_desc40 = (struct rtl8xxxu_txdesc40 *)tx_desc32; - if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX) - dev_info(dev, "%s: TX rate: %d, pkt size %d\n", - __func__, rate, cpu_to_le16(tx_desc40->pkt_size)); - if (rate_flags & IEEE80211_TX_RC_MCS && !ieee80211_is_mgmt(hdr->frame_control)) rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0; else rate = tx_rate->hw_value; + if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX) + dev_info(dev, "%s: TX rate: %d, pkt size %d\n", + __func__, rate, cpu_to_le16(tx_desc40->pkt_size)); + seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); tx_desc40->txdw4 = cpu_to_le32(rate);
Move the dev_info call that attempts to show the rate used before it is set. Signed-off-by: Barry Day <briselec@gmail.com> --- rtl8xxxu_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)