From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public•gmane.org>
To: jeff-o2qLIJkoznsdnm+yROfE0A@public•gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: Please pull 'upstream-jgarzik' branch of wireless-2.6
Date: Sat, 15 Sep 2007 09:21:34 -0400 [thread overview]
Message-ID: <20070915132134.GD6060@tuxdriver.com> (raw)
Jeff,
A few more for 2.6.24...
Thanks,
John
---
The following changes since commit 18d256761aa268fd2fb113c4fd26c400431f1dc1:
Jeff Garzik (1):
Merge branch 'stats' into upstream
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik
Jesper Juhl (1):
zd1211rw: Don't needlessly initialize variable to NULL in zd_chip
Larry Finger (1):
bcm43xx: Change radio hardware switch status printk from debug to regular
Ulrich Kunitz (1):
zd1211rw: add USB id for Telegent TG54USB WLAN adapter
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4 ++--
drivers/net/wireless/zd1211rw/zd_chip.c | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 618d1a2..4d84631 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
goto err_gpio_cleanup;
bcm43xx_radio_turn_on(bcm);
bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
- dprintk(KERN_INFO PFX "Radio %s by hardware\n",
+ printk(KERN_INFO PFX "Radio %s by hardware\n",
(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
bcm43xx_write16(bcm, 0x03E6, 0x0000);
@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(struct bcm43xx_private *bcm)
radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
bcm->radio_hw_enable = radio_hw_enable;
- dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
(radio_hw_enable == 0) ? "disabled" : "enabled");
bcm43xx_leds_update(bcm, 0);
}
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 4959042..06244d8 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -106,7 +106,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr
{
int r;
int i;
- zd_addr_t *a16 = (zd_addr_t *)NULL;
+ zd_addr_t *a16;
u16 *v16;
unsigned int count16;
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index e49628b..895ff84 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -55,6 +55,7 @@ static struct usb_device_id usb_ids[] = {
{ USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
/* ZD1211B */
{ USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
--
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public•gmane.org
next reply other threads:[~2007-09-15 13:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-15 13:21 John W. Linville [this message]
2007-09-18 1:54 ` Please pull 'upstream-jgarzik' branch of wireless-2.6 Zhu Yi
-- strict thread matches above, loose matches on Subject: below --
2008-01-08 22:23 John W. Linville
2007-12-20 15:54 John W. Linville
2007-12-16 4:34 John W. Linville
2007-12-17 23:24 ` Jeff Garzik
[not found] ` <47670514.4030204-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
2007-12-17 23:40 ` Jeff Garzik
2007-12-18 1:24 ` Zhu Yi
2007-12-04 13:59 John W. Linville
2007-12-04 20:13 ` Jeff Garzik
2007-11-27 14:47 John W. Linville
[not found] ` <20071127144748.GA12408-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-12-04 13:55 ` John W. Linville
2007-11-06 1:16 John W. Linville
2007-11-06 17:43 ` Jeff Garzik
[not found] <20070828231731.GB2967@tuxdriver.com>
[not found] ` <20070828231731.GB2967-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-31 13:44 ` Jeff Garzik
2007-08-15 0:36 John W. Linville
[not found] ` <20070815003637.GK7198-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-25 6:40 ` Jeff Garzik
2007-08-06 20:14 Please pull 'fixes-jgarzik' " John W. Linville
[not found] ` <20070806201441.GJ6442-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-06 20:16 ` Please pull 'upstream-jgarzik' " John W. Linville
2007-08-07 22:21 ` Jeff Garzik
2007-07-18 2:19 John W. Linville
[not found] ` <20070718021953.GC26907-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-07-18 22:31 ` Jeff Garzik
2007-07-10 18:57 John W. Linville
[not found] ` <20070710185758.GH7927-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-07-16 21:59 ` 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=20070915132134.GD6060@tuxdriver.com \
--to=linville-2xusbdqka4r54taoqtywwq@public$(echo .)gmane.org \
--cc=jeff-o2qLIJkoznsdnm+yROfE0A@public$(echo .)gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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