diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 13:52:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 13:52:31 -0800 |
| commit | c0c84ef5c130f8871adbdaac2ba824b9195cb6d9 (patch) | |
| tree | d7221b5323d5a4d3d84676d32bdca21d21d85a18 /net/wireless | |
| parent | 2360d2e8f01043632d6b651672bec66c49892f94 (diff) | |
| parent | 3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e (diff) | |
| download | linux-stable-c0c84ef5c130f8871adbdaac2ba824b9195cb6d9.tar.gz linux-stable-c0c84ef5c130f8871adbdaac2ba824b9195cb6d9.tar.bz2 linux-stable-c0c84ef5c130f8871adbdaac2ba824b9195cb6d9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index e9a5f8ca4c27..fe01de29bfe8 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -718,13 +718,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, wdev->ps = false; /* allow mac80211 to determine the timeout */ wdev->ps_timeout = -1; - if (rdev->ops->set_power_mgmt) - if (rdev->ops->set_power_mgmt(wdev->wiphy, dev, - wdev->ps, - wdev->ps_timeout)) { - /* assume this means it's off */ - wdev->ps = false; - } if (!dev->ethtool_ops) dev->ethtool_ops = &cfg80211_ethtool_ops; @@ -813,6 +806,19 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, rdev->opencount++; mutex_unlock(&rdev->devlist_mtx); cfg80211_unlock_rdev(rdev); + + /* + * Configure power management to the driver here so that its + * correctly set also after interface type changes etc. + */ + if (wdev->iftype == NL80211_IFTYPE_STATION && + rdev->ops->set_power_mgmt) + if (rdev->ops->set_power_mgmt(wdev->wiphy, dev, + wdev->ps, + wdev->ps_timeout)) { + /* assume this means it's off */ + wdev->ps = false; + } break; case NETDEV_UNREGISTER: /* |