From: "John W. Linville" <linville@tuxdriver.com>
To: Franky Lin <frankyl@broadcom.com>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH 15/15] brcm80211: smac: fix compilation issue with CONFIG_BCM47XX set
Date: Tue, 13 Dec 2011 14:59:39 -0500 [thread overview]
Message-ID: <20111213195939.GA2613@tuxdriver.com> (raw)
In-Reply-To: <1323731713-14942-16-git-send-email-frankyl@broadcom.com>
To preserve bisectability (just in case!), I'm folding this into the
original patch.
John
On Mon, Dec 12, 2011 at 03:15:13PM -0800, Franky Lin wrote:
> From: Arend van Spriel <arend@broadcom.com>
>
> With the BCMA support patches a compilation issue was introduced
> with CONFIG_BCM47XX set. This patch fixes that issue.
>
> Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Reviewed-by: Alwin Beukers <alwin@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Franky Lin <frankyl@broadcom.com>
> ---
> .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
> index 687aafa..d2c7fb1 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
> @@ -292,7 +292,7 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)
> bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
> bcma_write16(pi->d11core, D11REGOFFS(phyregdata), val);
> if (addr == 0x72)
> - (void)bcma_read16(pi->d11core, D11REGOFFS(phyregdata), val);
> + (void)bcma_read16(pi->d11core, D11REGOFFS(phyregdata));
> #else
> bcma_write32(pi->d11core, D11REGOFFS(phyregaddr), addr | (val << 16));
> if (++pi->phy_wreg >= pi->phy_wreg_limit) {
> --
> 1.7.5.4
>
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-12-13 20:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-12 23:14 [PATCH 00/15] brcm80211: the rest of smac bcma switch series Franky Lin
2011-12-12 23:14 ` [PATCH 01/15] brcm80211: smac: change ai_findcoreidx() to ai_findcore() Franky Lin
2011-12-12 23:15 ` [PATCH 02/15] brcm80211: smac: use bcma core access functions in otp.c Franky Lin
2011-12-12 23:15 ` [PATCH 03/15] brcm80211: smac: use bcma core access function in srom.c Franky Lin
2011-12-12 23:15 ` [PATCH 04/15] brcm80211: smac: use bcma core access functions in pmu.c Franky Lin
2011-12-12 23:15 ` [PATCH 05/15] brcm80211: smac: use bcma core access functions in aiutils.c Franky Lin
2011-12-12 23:15 ` [PATCH 06/15] brcm80211: smac: remove register access macro definitions Franky Lin
2011-12-12 23:15 ` [PATCH 07/15] brcm80211: smac: remove empty or unused functions from pmu.c Franky Lin
2011-12-12 23:15 ` [PATCH 08/15] brcm80211: smac: INTROFF/INTRESTORE macros removed Franky Lin
2011-12-12 23:15 ` [PATCH 09/15] brcm80211: smac: remove interrupt disable callback functionality Franky Lin
2011-12-12 23:15 ` [PATCH 10/15] brcm80211: smac: remove ai_switch_core() function Franky Lin
2011-12-12 23:15 ` [PATCH 11/15] brcm80211: smac: remove mapped core related function from aiutils.c Franky Lin
2011-12-12 23:15 ` [PATCH 12/15] brcm80211: smac: cleanup si_info structure definition Franky Lin
2011-12-12 23:15 ` [PATCH 13/15] brcm80211: smac: cleanup buscore handling in aiutils.c Franky Lin
2011-12-12 23:15 ` [PATCH 14/15] brcm80211: smac: register with bcma for specific 802.11 core revisions Franky Lin
2011-12-12 23:15 ` [PATCH 15/15] brcm80211: smac: fix compilation issue with CONFIG_BCM47XX set Franky Lin
2011-12-13 19:59 ` John W. Linville [this message]
2011-12-14 1:11 ` Franky Lin
2011-12-13 4:25 ` [PATCH 00/15] brcm80211: the rest of smac bcma switch series Larry Finger
2011-12-13 4:39 ` Franky Lin
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=20111213195939.GA2613@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=frankyl@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.