From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lucas De Marchi <lucas.demarchi@profusion.mobi>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree
Date: Fri, 08 Apr 2011 08:11:47 +0300 [thread overview]
Message-ID: <20110408081147.19296me5tyhexecc@hayate.sektori.org> (raw)
In-Reply-To: <20110408141054.2582833a.sfr@canb.auug.org.au>
Quoting Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/zd1211rw/zd_rf_rf2959.c between commit 25985edcedea
> ("Fix common misspellings") from Linus' tree and commit fbd5d17b8e2b
> ("zd1211rw: rename CR* macros to ZD_CR*") from the wireless tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Fix looks ok to me.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> index e361174,0325426..0000000
> --- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> +++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> @@@ -152,44 -152,44 +152,44 @@@ static int rf2959_init_hw(struct zd_rf
> struct zd_chip *chip = zd_rf_to_chip(rf);
>
> static const struct zd_ioreq16 ioreqs[] = {
> - { CR2, 0x1E }, { CR9, 0x20 }, { CR10, 0x89 },
> - { CR11, 0x00 }, { CR15, 0xD0 }, { CR17, 0x68 },
> - { CR19, 0x4a }, { CR20, 0x0c }, { CR21, 0x0E },
> - { CR23, 0x48 },
> + { ZD_CR2, 0x1E }, { ZD_CR9, 0x20 }, { ZD_CR10, 0x89 },
> + { ZD_CR11, 0x00 }, { ZD_CR15, 0xD0 }, { ZD_CR17, 0x68 },
> + { ZD_CR19, 0x4a }, { ZD_CR20, 0x0c }, { ZD_CR21, 0x0E },
> + { ZD_CR23, 0x48 },
> /* normal size for cca threshold */
> - { CR24, 0x14 },
> - /* { CR24, 0x20 }, */
> - { CR26, 0x90 }, { CR27, 0x30 }, { CR29, 0x20 },
> - { CR31, 0xb2 }, { CR32, 0x43 }, { CR33, 0x28 },
> - { CR38, 0x30 }, { CR34, 0x0f }, { CR35, 0xF0 },
> - { CR41, 0x2a }, { CR46, 0x7F }, { CR47, 0x1E },
> - { CR51, 0xc5 }, { CR52, 0xc5 }, { CR53, 0xc5 },
> - { CR79, 0x58 }, { CR80, 0x30 }, { CR81, 0x30 },
> - { CR82, 0x00 }, { CR83, 0x24 }, { CR84, 0x04 },
> - { CR85, 0x00 }, { CR86, 0x10 }, { CR87, 0x2A },
> - { CR88, 0x10 }, { CR89, 0x24 }, { CR90, 0x18 },
> - /* { CR91, 0x18 }, */
> + { ZD_CR24, 0x14 },
> + /* { ZD_CR24, 0x20 }, */
> + { ZD_CR26, 0x90 }, { ZD_CR27, 0x30 }, { ZD_CR29, 0x20 },
> + { ZD_CR31, 0xb2 }, { ZD_CR32, 0x43 }, { ZD_CR33, 0x28 },
> + { ZD_CR38, 0x30 }, { ZD_CR34, 0x0f }, { ZD_CR35, 0xF0 },
> + { ZD_CR41, 0x2a }, { ZD_CR46, 0x7F }, { ZD_CR47, 0x1E },
> + { ZD_CR51, 0xc5 }, { ZD_CR52, 0xc5 }, { ZD_CR53, 0xc5 },
> + { ZD_CR79, 0x58 }, { ZD_CR80, 0x30 }, { ZD_CR81, 0x30 },
> + { ZD_CR82, 0x00 }, { ZD_CR83, 0x24 }, { ZD_CR84, 0x04 },
> + { ZD_CR85, 0x00 }, { ZD_CR86, 0x10 }, { ZD_CR87, 0x2A },
> + { ZD_CR88, 0x10 }, { ZD_CR89, 0x24 }, { ZD_CR90, 0x18 },
> + /* { ZD_CR91, 0x18 }, */
> - /* should solve continous CTS frame problems */
> + /* should solve continuous CTS frame problems */
> - { CR91, 0x00 },
> - { CR92, 0x0a }, { CR93, 0x00 }, { CR94, 0x01 },
> - { CR95, 0x00 }, { CR96, 0x40 }, { CR97, 0x37 },
> - { CR98, 0x05 }, { CR99, 0x28 }, { CR100, 0x00 },
> - { CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 },
> - { CR104, 0x18 }, { CR105, 0x12 },
> + { ZD_CR91, 0x00 },
> + { ZD_CR92, 0x0a }, { ZD_CR93, 0x00 }, { ZD_CR94, 0x01 },
> + { ZD_CR95, 0x00 }, { ZD_CR96, 0x40 }, { ZD_CR97, 0x37 },
> + { ZD_CR98, 0x05 }, { ZD_CR99, 0x28 }, { ZD_CR100, 0x00 },
> + { ZD_CR101, 0x13 }, { ZD_CR102, 0x27 }, { ZD_CR103, 0x27 },
> + { ZD_CR104, 0x18 }, { ZD_CR105, 0x12 },
> /* normal size */
> - { CR106, 0x1a },
> - /* { CR106, 0x22 }, */
> - { CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 },
> - { CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 },
> - { CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 },
> - { CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 },
> - { CR119, 0x16 },
> + { ZD_CR106, 0x1a },
> + /* { ZD_CR106, 0x22 }, */
> + { ZD_CR107, 0x24 }, { ZD_CR108, 0x0a }, { ZD_CR109, 0x13 },
> + { ZD_CR110, 0x2F }, { ZD_CR111, 0x27 }, { ZD_CR112, 0x27 },
> + { ZD_CR113, 0x27 }, { ZD_CR114, 0x27 }, { ZD_CR115, 0x40 },
> + { ZD_CR116, 0x40 }, { ZD_CR117, 0xF0 }, { ZD_CR118, 0xF0 },
> + { ZD_CR119, 0x16 },
> /* no TX continuation */
> - { CR122, 0x00 },
> - /* { CR122, 0xff }, */
> - { CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 },
> - { CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB },
> - { CR170, 0xBB },
> + { ZD_CR122, 0x00 },
> + /* { ZD_CR122, 0xff }, */
> + { ZD_CR127, 0x03 }, { ZD_CR131, 0x08 }, { ZD_CR138, 0x28 },
> + { ZD_CR148, 0x44 }, { ZD_CR150, 0x10 }, { ZD_CR169, 0xBB },
> + { ZD_CR170, 0xBB },
> };
>
> static const u32 rv[] = {
>
>
next prev parent reply other threads:[~2011-04-08 5:19 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 4:10 linux-next: manual merge of the wireless tree with Linus' tree Stephen Rothwell
2011-04-08 5:11 ` Jussi Kivilinna [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 0:19 Stephen Rothwell
2012-01-04 1:40 Stephen Rothwell
2011-09-20 3:28 Stephen Rothwell
2011-09-20 12:55 ` John W. Linville
2011-09-20 3:22 Stephen Rothwell
2011-09-19 5:14 Stephen Rothwell
2011-09-19 5:28 ` Luciano Coelho
2011-09-15 3:14 Stephen Rothwell
2011-09-15 7:17 ` Helmut Schaa
2011-09-15 3:14 Stephen Rothwell
2011-08-30 3:46 Stephen Rothwell
2011-05-12 1:42 Stephen Rothwell
2011-05-11 1:52 Stephen Rothwell
2011-04-27 1:00 Stephen Rothwell
2011-04-13 2:30 Stephen Rothwell
2011-04-08 4:10 Stephen Rothwell
2010-09-21 2:20 Stephen Rothwell
2010-09-21 2:09 Stephen Rothwell
2010-09-21 6:53 ` Ohad Ben-Cohen
2010-09-21 8:57 ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
2010-08-17 1:52 Stephen Rothwell
2010-08-17 2:59 ` Rusty Russell
2010-08-17 3:07 ` Stephen Rothwell
2010-06-15 2:00 Stephen Rothwell
2010-06-15 14:42 ` John W. Linville
2010-05-10 1:27 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-01-06 2:29 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=20110408081147.19296me5tyhexecc@hayate.sektori.org \
--to=jussi.kivilinna@mbnet.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=lucas.demarchi@profusion.mobi \
--cc=sfr@canb.auug.org.au \
/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).