From: "John W. Linville" <linville@tuxdriver.com>
To: jeff@garzik.org
Cc: netdev@vger.kernel.org
Subject: Please pull 'upstream-fixes' branch of wireless-2.6
Date: Thu, 18 Jan 2007 10:48:02 -0500 [thread overview]
Message-ID: <20070118154801.GB31580@tuxdriver.com> (raw)
The following changes since commit a8b3485287731978899ced11f24628c927890e78:
Linus Torvalds (1):
Linux v2.6.20-rc5
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-fixes
Larry Finger (1):
bcm43xx: Fix failure to deliver PCI-E interrupts
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 2ec2e5a..91b752e 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2701,8 +2701,8 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
/* extract core_id, core_rev, core_vendor */
- core_id = (sb_id_hi & 0xFFF0) >> 4;
- core_rev = (sb_id_hi & 0xF);
+ core_id = (sb_id_hi & 0x8FF0) >> 4;
+ core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8));
core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n",
@@ -2873,7 +2873,10 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm,
sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
- sbimconfiglow |= 0x32;
+ if (bcm->bustype == BCM43xx_BUSTYPE_PCI)
+ sbimconfiglow |= 0x32;
+ else
+ sbimconfiglow |= 0x53;
bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow);
}
@@ -3077,7 +3080,7 @@ static int bcm43xx_setup_backplane_pci_connection(struct bcm43xx_private *bcm,
if (err)
goto out;
- if (bcm->current_core->rev < 6 ||
+ if (bcm->current_core->rev < 6 &&
bcm->current_core->id == BCM43xx_COREID_PCI) {
value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC);
value |= (1 << backplane_flag_nr);
--
John W. Linville
linville@tuxdriver.com
next reply other threads:[~2007-01-18 16:26 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-18 15:48 John W. Linville [this message]
2007-01-18 15:49 ` Please pull 'upstream' branch of wireless-2.6 John W. Linville
2007-01-19 3:10 ` Jeff Garzik
2007-01-19 8:42 ` John W. Linville
2007-01-23 5:36 ` Jeff Garzik
2007-01-18 16:46 ` Please pull 'upstream-fixes' " Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2007-05-29 18:30 John W. Linville
2007-05-29 18:30 ` John W. Linville
2007-05-30 13:46 ` Jeff Garzik
2007-05-30 13:46 ` Jeff Garzik
2007-05-22 15:17 John W. Linville
2007-05-22 15:17 John W. Linville
2007-05-24 21:17 ` Jeff Garzik
2007-04-10 20:23 John W. Linville
2007-04-11 15:58 ` Jeff Garzik
2007-03-27 18:26 John W. Linville
2007-03-28 6:21 ` Jeff Garzik
2007-03-16 21:31 John W. Linville
2007-03-08 3:30 John W. Linville
2007-03-09 16:58 ` Jeff Garzik
2007-02-27 20:50 John W. Linville
2007-03-03 0:41 ` Jeff Garzik
2007-02-02 21:27 Please pull "upstream-fixes" " John W. Linville
2007-02-07 0:06 ` Jeff Garzik
2007-02-07 0:06 ` Jeff Garzik
2007-01-03 2:41 Please pull 'upstream-fixes' " John W. Linville
2006-12-21 3:03 John W. Linville
2006-12-26 21:39 ` Jeff Garzik
2006-11-15 1:29 John W. Linville
2006-11-28 19:14 ` John W. Linville
2006-11-08 4:58 John W. Linville
2006-11-10 16:11 ` Jeff Garzik
2006-10-17 21:34 John W. Linville
2006-10-21 18:22 ` Jeff Garzik
2006-09-11 23:58 John W. Linville
2006-09-12 15:42 ` Jeff Garzik
2006-08-23 18:46 John W. Linville
2006-08-24 4:41 ` Jeff Garzik
2006-08-04 20:58 John W. Linville
2006-08-09 3:48 ` Jeff Garzik
2006-08-02 21:56 John W. Linville
2006-08-03 21:19 ` Jeff Garzik
2006-07-28 0:22 John W. Linville
2006-07-29 4:32 ` Jeff Garzik
2006-07-10 21:29 John W. Linville
2006-06-05 21:53 John W. Linville
2006-06-08 19:46 ` Jeff Garzik
2006-05-26 20:37 John W. Linville
2006-05-27 1:26 ` Jeff Garzik
2006-05-22 19:18 John W. Linville
2006-05-24 4:26 ` Jeff Garzik
2006-05-24 8:52 ` Andrew Morton
2006-05-17 19:34 John W. Linville
2006-05-06 1:06 Please pull upstream-fixes " John W. Linville
2006-05-06 3:08 ` Andrew Morton
2006-05-06 3:20 ` Linus Torvalds
2006-05-06 4:12 ` Stephen Hemminger
2006-05-06 13:45 ` John W. Linville
2006-04-24 19:40 Please pull 'upstream-fixes' " John W. Linville
2006-04-26 10:17 ` Jeff Garzik
2006-04-20 1:12 Please pull upstream-fixes " John W. Linville
2006-04-20 8:51 ` Michael Buesch
2006-04-20 8:57 ` Andrew Morton
2006-04-20 9:12 ` Michael Buesch
2006-04-20 12:53 ` John W. Linville
2006-04-20 19:58 ` Andrew Morton
2006-04-20 22:28 ` Linus Torvalds
2006-04-20 9:00 ` Jeff Garzik
2006-04-20 21:36 ` Jeff Garzik
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=20070118154801.GB31580@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=jeff@garzik.org \
--cc=netdev@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.