Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c55c434 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'fixes-jgarzik' of... 

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents f778089c ee0a8169

drivers/net/wireless/bcm43xx/bcm43xx_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, 
	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;