Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
This commit is contained in:
commit
5c55c43491
|
@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
|
||||||
u16 maxpower;
|
u16 maxpower;
|
||||||
|
|
||||||
if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
|
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;
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,7 @@ check_assoc_again:
|
||||||
sm->associnfo.associating = 1;
|
sm->associnfo.associating = 1;
|
||||||
/* queue lower level code to do work (if necessary) */
|
/* queue lower level code to do work (if necessary) */
|
||||||
schedule_delayed_work(&sm->associnfo.work, 0);
|
schedule_delayed_work(&sm->associnfo.work, 0);
|
||||||
out:
|
|
||||||
mutex_unlock(&sm->associnfo.mutex);
|
mutex_unlock(&sm->associnfo.mutex);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue