From 2edf247e6eb8e98636b87d046a46aa9b64eead5a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 22 Apr 2009 12:40:07 +0200 Subject: [PATCH] --- yaml --- r: 149999 b: refs/heads/master c: e255d5eb2b478eec1416b46aea03798b64355402 h: refs/heads/master i: 149997: eb8e474465bd68cd5e4d90e667cc579c7665b5ad 149995: e697c886176eb1c274c4d5707a4892aa44c5ddfe 149991: 544e030ce7bd2714a150f45f2b0c61dce65b46fc 149983: 365dece05db141eeb53eaf7872c3270b759a053b v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 10 ++++------ trunk/net/mac80211/wext.c | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 53610ad29670..88d8827e2c7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d4df3a50f40a731fc03c86a76535ed141b0e4bc +refs/heads/master: e255d5eb2b478eec1416b46aea03798b64355402 diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index d9686917252b..183956e4930a 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -532,8 +532,7 @@ enum ieee80211_conf_flags { * @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed - * @IEEE80211_CONF_CHANGE_PS: the PS flag changed - * @IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT: the dynamic PS timeout changed + * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed * @IEEE80211_CONF_CHANGE_POWER: the TX power changed * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed @@ -544,10 +543,9 @@ enum ieee80211_conf_changed { IEEE80211_CONF_CHANGE_LISTEN_INTERVAL = BIT(2), IEEE80211_CONF_CHANGE_RADIOTAP = BIT(3), IEEE80211_CONF_CHANGE_PS = BIT(4), - IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT = BIT(5), - IEEE80211_CONF_CHANGE_POWER = BIT(6), - IEEE80211_CONF_CHANGE_CHANNEL = BIT(7), - IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(8), + IEEE80211_CONF_CHANGE_POWER = BIT(5), + IEEE80211_CONF_CHANGE_CHANNEL = BIT(6), + IEEE80211_CONF_CHANGE_RETRY_LIMITS = BIT(7), }; /** diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c index 1eb6d8642a77..1a649da42c41 100644 --- a/trunk/net/mac80211/wext.c +++ b/trunk/net/mac80211/wext.c @@ -622,8 +622,7 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev, conf->dynamic_ps_timeout = timeout; if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS) - ieee80211_hw_config(local, - IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT); + ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); ieee80211_recalc_ps(local, -1);