From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Larry Finger <Larry.Finger@lwfinger.net>,
Troy Tan <troy_tan@realsil.com.cn>
Subject: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date: Mon, 9 Feb 2015 14:14:47 +1100 [thread overview]
Message-ID: <20150209141447.43697f4b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]
Hi Kalle,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/rtlwifi/pci.c between commit
e9538cf4f907 ("rtlwifi: Fix error when accessing unmapped memory in
skb") from Linus' tree and commit d0311314d002 ("rtlwifi: rtl8192ee:
Fix handling of new style descriptors") from the wireless-drivers-next
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/rtlwifi/pci.c
index c70efb9a6e78,88331d729b0e..000000000000
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@@ -924,17 -917,14 +931,16 @@@ new_trx_end
rtlpriv->enter_ps = false;
schedule_work(&rtlpriv->works.lps_change_work);
}
- end:
+ skb = new_skb;
+no_new:
if (rtlpriv->use_new_trx_flow) {
- _rtl_pci_init_one_rxdesc(hw, (u8 *)buffer_desc,
+ _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)buffer_desc,
rxring_idx,
- rtlpci->rx_ring[rxring_idx].idx);
+ rtlpci->rx_ring[rxring_idx].idx);
} else {
- _rtl_pci_init_one_rxdesc(hw, (u8 *)pdesc, rxring_idx,
+ _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)pdesc,
+ rxring_idx,
rtlpci->rx_ring[rxring_idx].idx);
-
if (rtlpci->rx_ring[rxring_idx].idx ==
rtlpci->rxringcount - 1)
rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-09 3:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-09 3:14 Stephen Rothwell [this message]
2015-12-07 3:13 linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell
2015-12-07 14:59 ` Kalle Valo
2015-12-07 17:51 ` Kalle Valo
2017-08-04 2:04 Stephen Rothwell
2017-08-04 6:36 ` Kalle Valo
2017-08-24 1:17 Stephen Rothwell
2017-08-24 1:32 ` Stephen Rothwell
2017-08-24 7:44 ` Kalle Valo
2017-08-24 1:24 Stephen Rothwell
2017-08-24 1:28 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150209141447.43697f4b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Larry.Finger@lwfinger.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=troy_tan@realsil.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).