Skip to contentSkip to conversation

Please pull 'fixes-jgarzik' branch of wireless-2.6

PATCH John W. Linville 2 participants 2 messages Oct 3, 2007

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

John W. Linville

author
#0 lore raw

The following changes since commit 3146b39c185f8a436d430132457e84fa1d8f8208:
Linus Torvalds (1):

        Linux 2.6.23-rc9

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-jgarzik

Joe Perches (1):
bcm43xx: Correct printk with PFX before KERN_

Richard Knutsson (1):
softmac: Fix compiler-warning

 drivers/net/wireless/bcm43xx/bcm43xx_wx.c   |    2 +-
 net/ieee80211/softmac/ieee80211softmac_wx.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/bcm43xx/bcm43xx_wx.c +1 -1
index d6d9413..6acfdc4 100644
@@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
 	u16 maxpower;
 
 	if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
-		printk(PFX KERN_ERR "TX power not in dBm.\n");
+		printk(KERN_ERR PFX "TX power not in dBm.\n");
 		return -EOPNOTSUPP;
 	}
net/ieee80211/softmac/ieee80211softmac_wx.c +1 -1
index 442b987..5742dc8 100644
@@ -114,7 +114,7 @@ check_assoc_again:
 	sm->associnfo.associating = 1;
 	/* queue lower level code to do work (if necessary) */
 	schedule_delayed_work(&sm->associnfo.work, 0);
-out:
+
 	mutex_unlock(&sm->associnfo.mutex);
 
 	return 0;
Signature · 2 lines
John W. Linville
[email protected]
#1 lore raw
Quoted 6 lines · John W. Linville

The following changes since commit 3146b39c185f8a436d430132457e84fa1d8f8208:
Linus Torvalds (1):

        Linux 2.6.23-rc9

are available in the git repository at:

Quoted 7 lines

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-jgarzik

Joe Perches (1):
bcm43xx: Correct printk with PFX before KERN_

Richard Knutsson (1):
softmac: Fix compiler-warning

pulled