Return-path: Received: from mail-da0-f49.google.com ([209.85.210.49]:64143 "EHLO mail-da0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212Ab2LZXRf (ORCPT ); Wed, 26 Dec 2012 18:17:35 -0500 Message-ID: <50DB858A.9070905@lwfinger.net> (sfid-20121227_001744_055392_E6C3BCD8) Date: Wed, 26 Dec 2012 17:17:30 -0600 From: Larry Finger MIME-Version: 1.0 To: Eric Dumazet CC: linville@tuxdriver.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH V3.8 5/5] rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call References: <1356559691-5048-1-git-send-email-Larry.Finger@lwfinger.net> <1356559691-5048-6-git-send-email-Larry.Finger@lwfinger.net> <1356563631.30414.3.camel@edumazet-glaptop> In-Reply-To: <1356563631.30414.3.camel@edumazet-glaptop> Content-Type: text/plain; charset=UTF-8; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 12/26/2012 05:13 PM, Eric Dumazet wrote: > On Wed, 2012-12-26 at 16:08 -0600, Larry Finger wrote: >> Kernel 3.8 implements checking of all DMA mapping calls and issues >> a WARNING for the first it finds that is not checked. >> >> Signed-off-by: Larry Finger >> --- >> drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c >> index 87331d8..7ddd517 100644 >> --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c >> +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c >> @@ -387,6 +387,12 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw, >> PCI_DMA_TODEVICE); >> u8 bw_40 = 0; >> >> + if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { >> + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, >> + "DMA mapping error"); >> + return; >> + } >> + CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); >> if (mac->opmode == NL80211_IFTYPE_STATION) { >> bw_40 = mac->bw_40; >> } else if (mac->opmode == NL80211_IFTYPE_AP || >> @@ -542,6 +548,12 @@ void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw, >> PCI_DMA_TODEVICE); >> __le16 fc = hdr->frame_control; >> >> + if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { >> + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, >> + "DMA mapping error"); >> + return; >> + } >> + CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); >> CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); >> >> if (firstseg) > > This seems wrong... > > CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE) doesnt need to be done > twice, does it ? No it does not. That is a patching error Thanks, Larry