| Message ID | 1360184478-31481-2-git-send-email-seth.forshee@canonical.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, 2013-02-06 at 15:01 -0600, Seth Forshee wrote: > The powersave configuration in struct ieee80211_conf is currently a > binary state, either enabled or disabled. This is inadequate for > expressing the situation during off-channel operation, when powersave is > set at the AP to request bufferring of frames but the hardware remains > fully awake. Some drivers (e.g. brcmsmac) need to perform configuration > to support this in-between state but lack the information to do so. > > To prepare for adding an off-channel powersave mode, expand the current > powersave configuration flag to two bits to support expressing another > state. Add helper functions for setting and retrieving the state, and > convert mac80211 and drivers to use these functions. > > In changing from a binary flag to powersave mode, also update the > terminology used to name the states for clarity. The "enabled" state is > changed to "doze" to indicate a low power hardware state, and the > "disabled" state is changed to "awake" to indicate a fully powerd on > hardware state. This is consistent with the terminology defined in IEEE > 802.11-2012 section 10.2.1.2. Ok so I'm reviewing this again. I'm not really convinced this is the right thing to do. Sooner or later, multi-virtual interface support will become more relevant, and then all of this is completely moot because then powersave is entirely disabled and not handled right now. Is all this really worth it? It seems a quick fix for brcmsmac might be to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is enabled in the config, and then go implement a real solution like I described earlier with powersave being separated out of the core mac80211 routines, and actually made possible for multiple interfaces? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 13, 2013 at 04:06:10PM +0100, Johannes Berg wrote: > On Wed, 2013-02-06 at 15:01 -0600, Seth Forshee wrote: > > The powersave configuration in struct ieee80211_conf is currently a > > binary state, either enabled or disabled. This is inadequate for > > expressing the situation during off-channel operation, when powersave is > > set at the AP to request bufferring of frames but the hardware remains > > fully awake. Some drivers (e.g. brcmsmac) need to perform configuration > > to support this in-between state but lack the information to do so. > > > > To prepare for adding an off-channel powersave mode, expand the current > > powersave configuration flag to two bits to support expressing another > > state. Add helper functions for setting and retrieving the state, and > > convert mac80211 and drivers to use these functions. > > > > In changing from a binary flag to powersave mode, also update the > > terminology used to name the states for clarity. The "enabled" state is > > changed to "doze" to indicate a low power hardware state, and the > > "disabled" state is changed to "awake" to indicate a fully powerd on > > hardware state. This is consistent with the terminology defined in IEEE > > 802.11-2012 section 10.2.1.2. > > Ok so I'm reviewing this again. > > I'm not really convinced this is the right thing to do. Sooner or later, > multi-virtual interface support will become more relevant, and then all > of this is completely moot because then powersave is entirely disabled > and not handled right now. Hmm, I don't recall you really going into any detail regarding powersave, only managing the queues for off-channel. Though I can see that multi-vif throws a wrench into things, even if I don't understand all the details. > Is all this really worth it? It seems a quick fix for brcmsmac might be > to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is > enabled in the config, and then go implement a real solution like I > described earlier with powersave being separated out of the core > mac80211 routines, and actually made possible for multiple interfaces? Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable PS is sent the flag won't be set, as we're still on the operating channel. When we're actually off-channel the value of PM doesn't matter for the types of frames which are being sent. The only quick fix I've found is to watch out for frames with PM set and set the powersave bit while they're being transmitted. I'm going to have to spend some time trying to grok how powersave would work out with multiple interfaces. Honestly though I don't know that multiple interfaces is something that we have any interest in at the moment, and if not then it may be difficult for me to justify spending much time on it. Seth -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/13/2013 06:04 PM, Seth Forshee wrote: >> Is all this really worth it? It seems a quick fix for brcmsmac might be >> > to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is >> > enabled in the config, and then go implement a real solution like I >> > described earlier with powersave being separated out of the core >> > mac80211 routines, and actually made possible for multiple interfaces? > Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable > PS is sent the flag won't be set, as we're still on the operating > channel. When we're actually off-channel the value of PM doesn't matter > for the types of frames which are being sent. The only quick fix I've > found is to watch out for frames with PM set and set the powersave bit > while they're being transmitted. I actually don't see that one fly. The frames are posted on a DMA fifo towards the hardware so in the driver we have no clue when that frame is being processes/transmitted hence no way of knowing when to write the register(s). Gr. AvS -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2013-02-13 at 19:54 +0100, Arend van Spriel wrote: > On 02/13/2013 06:04 PM, Seth Forshee wrote: > >> Is all this really worth it? It seems a quick fix for brcmsmac might be > >> > to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is > >> > enabled in the config, and then go implement a real solution like I > >> > described earlier with powersave being separated out of the core > >> > mac80211 routines, and actually made possible for multiple interfaces? > > Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable > > PS is sent the flag won't be set, as we're still on the operating > > channel. When we're actually off-channel the value of PM doesn't matter > > for the types of frames which are being sent. The only quick fix I've > > found is to watch out for frames with PM set and set the powersave bit > > while they're being transmitted. > > I actually don't see that one fly. The frames are posted on a DMA fifo > towards the hardware so in the driver we have no clue when that frame is > being processes/transmitted hence no way of knowing when to write the > register(s). I think the various flushing would prevent issues there, no? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 13, 2013 at 07:54:19PM +0100, Arend van Spriel wrote: > On 02/13/2013 06:04 PM, Seth Forshee wrote: > >> Is all this really worth it? It seems a quick fix for brcmsmac might be > >> > to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is > >> > enabled in the config, and then go implement a real solution like I > >> > described earlier with powersave being separated out of the core > >> > mac80211 routines, and actually made possible for multiple interfaces? > > Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable > > PS is sent the flag won't be set, as we're still on the operating > > channel. When we're actually off-channel the value of PM doesn't matter > > for the types of frames which are being sent. The only quick fix I've > > found is to watch out for frames with PM set and set the powersave bit > > while they're being transmitted. > > I actually don't see that one fly. The frames are posted on a DMA fifo > towards the hardware so in the driver we have no clue when that frame is > being processes/transmitted hence no way of knowing when to write the > register(s). There's a couple of ways of doing it. I had a working patch at one point but can't seem to find it now, so I'm not sure which way I used. You're right though that we can't tell when the hardware is actually processing or transmitting the frame, so in either case MCTL_HPS has to be set before you put the frame in the tx fifo. The first option is that for any frame with PM set, set MCTL_HPS when mac80211 hands off the frame and clear it once it has finished transmitting. The second option is to look specifically for nullfunc frames and set or clear MCTL_HPS based on the value of PM. Either of these should work fine with the current mac80211 code, but overall the second one is probably a little safer. Seth -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/13/2013 08:25 PM, Seth Forshee wrote: > On Wed, Feb 13, 2013 at 07:54:19PM +0100, Arend van Spriel wrote: >> On 02/13/2013 06:04 PM, Seth Forshee wrote: >>>> Is all this really worth it? It seems a quick fix for brcmsmac might be >>>>> to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is >>>>> enabled in the config, and then go implement a real solution like I >>>>> described earlier with powersave being separated out of the core >>>>> mac80211 routines, and actually made possible for multiple interfaces? >>> Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable >>> PS is sent the flag won't be set, as we're still on the operating >>> channel. When we're actually off-channel the value of PM doesn't matter >>> for the types of frames which are being sent. The only quick fix I've >>> found is to watch out for frames with PM set and set the powersave bit >>> while they're being transmitted. >> >> I actually don't see that one fly. The frames are posted on a DMA fifo >> towards the hardware so in the driver we have no clue when that frame is >> being processes/transmitted hence no way of knowing when to write the >> register(s). > > There's a couple of ways of doing it. I had a working patch at one point > but can't seem to find it now, so I'm not sure which way I used. You're > right though that we can't tell when the hardware is actually processing > or transmitting the frame, so in either case MCTL_HPS has to be set > before you put the frame in the tx fifo. > > The first option is that for any frame with PM set, set MCTL_HPS when > mac80211 hands off the frame and clear it once it has finished > transmitting. > > The second option is to look specifically for nullfunc frames and set or > clear MCTL_HPS based on the value of PM. > > Either of these should work fine with the current mac80211 code, but > overall the second one is probably a little safer. So you have verified that the last packet mac80211 sends before going off-channel is the nullfunc frame with PM bit set. I have seen packets coming in our driver during the .flush() callback, but never checked whether the last of those packets is indeed the nullfunc. Gr. AvS -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 13, 2013 at 10:43:14PM +0100, Arend van Spriel wrote: > On 02/13/2013 08:25 PM, Seth Forshee wrote: > > On Wed, Feb 13, 2013 at 07:54:19PM +0100, Arend van Spriel wrote: > >> On 02/13/2013 06:04 PM, Seth Forshee wrote: > >>>> Is all this really worth it? It seems a quick fix for brcmsmac might be > >>>>> to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is > >>>>> enabled in the config, and then go implement a real solution like I > >>>>> described earlier with powersave being separated out of the core > >>>>> mac80211 routines, and actually made possible for multiple interfaces? > >>> Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable > >>> PS is sent the flag won't be set, as we're still on the operating > >>> channel. When we're actually off-channel the value of PM doesn't matter > >>> for the types of frames which are being sent. The only quick fix I've > >>> found is to watch out for frames with PM set and set the powersave bit > >>> while they're being transmitted. > >> > >> I actually don't see that one fly. The frames are posted on a DMA fifo > >> towards the hardware so in the driver we have no clue when that frame is > >> being processes/transmitted hence no way of knowing when to write the > >> register(s). > > > > There's a couple of ways of doing it. I had a working patch at one point > > but can't seem to find it now, so I'm not sure which way I used. You're > > right though that we can't tell when the hardware is actually processing > > or transmitting the frame, so in either case MCTL_HPS has to be set > > before you put the frame in the tx fifo. > > > > The first option is that for any frame with PM set, set MCTL_HPS when > > mac80211 hands off the frame and clear it once it has finished > > transmitting. > > > > The second option is to look specifically for nullfunc frames and set or > > clear MCTL_HPS based on the value of PM. > > > > Either of these should work fine with the current mac80211 code, but > > overall the second one is probably a little safer. > > So you have verified that the last packet mac80211 sends before going > off-channel is the nullfunc frame with PM bit set. I have seen packets > coming in our driver during the .flush() callback, but never checked > whether the last of those packets is indeed the nullfunc. The other set of patches I was working on ensures that the last frame before going off-channel is a nullfunc with PM set. The order of events is now: * stop the mac80211 queues with the offchannel stop reason * flush * send a nullfunc with PM set * flush again Without the first flush ath9k was often transmitting data frames with PM clear after the nullfunc. The second flush ensures the nullfunc gets sent before we go off-channel. Since the mac80211 queues are stopped during the flushes you shouldn't see any frames coming in (at least not during these flushes). I've done numerous wireshark traces with both brcmsmac and ath9k with these changes, and the nullfunc is the last thing on the air before going off-channel. Of course things still aren't working quite right with brcmsmac since the hardware is clearing the PM bit. Seth -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[-ilw list, it just bothers me about putting emails into quarantine] > > I'm not really convinced this is the right thing to do. Sooner or later, > > multi-virtual interface support will become more relevant, and then all > > of this is completely moot because then powersave is entirely disabled > > and not handled right now. > > Hmm, I don't recall you really going into any detail regarding > powersave, only managing the queues for off-channel. Though I can see > that multi-vif throws a wrench into things, even if I don't understand > all the details. Yeah, that must've been another time. I've evidently been kicking around these ideas in my head for long enough to not be able to tell apart reality and dream any more ;-) > > Is all this really worth it? It seems a quick fix for brcmsmac might be > > to always set the powersave bit when IEEE80211_CONF_OFFCHANNEL is > > enabled in the config, and then go implement a real solution like I > > described earlier with powersave being separated out of the core > > mac80211 routines, and actually made possible for multiple interfaces? > > Using IEEE80211_CONF_OFFCHANNEL won't work. When the nullfunc to enable > PS is sent the flag won't be set, as we're still on the operating > channel. When we're actually off-channel the value of PM doesn't matter > for the types of frames which are being sent. Oh, right. > The only quick fix I've > found is to watch out for frames with PM set and set the powersave bit > while they're being transmitted. That's ugly. > I'm going to have to spend some time trying to grok how powersave would > work out with multiple interfaces. Honestly though I don't know that > multiple interfaces is something that we have any interest in at the > moment, and if not then it may be difficult for me to justify spending > much time on it. Yeah, I know, nobody really seems to care, but the current code is so crappy ... do I have to _make_ people care by just removing all powersave code? Hard to justify too ... :) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index a8016d7..4a508de 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1212,7 +1212,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed) } if (changed & IEEE80211_CONF_CHANGE_PS) { - if (conf->flags & IEEE80211_CONF_PS) { + if (ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE) { ath9k_htc_setpower(priv, ATH9K_PM_NETWORK_SLEEP); priv->ps_enabled = true; } else { diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 5432f12..93fb439 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1169,7 +1169,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) if (changed & IEEE80211_CONF_CHANGE_PS) { unsigned long flags; spin_lock_irqsave(&sc->sc_pm_lock, flags); - if (conf->flags & IEEE80211_CONF_PS) + if (ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE) ath9k_enable_ps(sc); else ath9k_disable_ps(sc); diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index ef82751..4af4a66 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -836,7 +836,8 @@ static int carl9170_ps_update(struct ar9170 *ar) int err = 0; if (!ar->ps.off_override) - ps = (ar->hw->conf.flags & IEEE80211_CONF_PS); + ps = ieee80211_conf_ps_mode(&ar->hw->conf) == + IEEE80211_PS_DOZE; if (ps != ar->ps.state) { err = carl9170_powersave(ar, ps); diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 4684dd9..ba4563e 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c @@ -524,7 +524,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) u8 tim_len; bool cam; - if (likely(!(ar->hw->conf.flags & IEEE80211_CONF_PS))) + if (likely(ieee80211_conf_ps_mode(&ar->hw->conf) != IEEE80211_PS_DOZE)) return; /* check if this really is a beacon */ diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index c6451c6..5f49326 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -396,7 +396,8 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed) "true" : "false"); if (changed & IEEE80211_CONF_CHANGE_PS) brcms_err(core, "%s: change power-save mode: %s (implement)\n", - __func__, conf->flags & IEEE80211_CONF_PS ? + __func__, + ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE ? "true" : "false"); if (changed & IEEE80211_CONF_CHANGE_POWER) { diff --git a/drivers/net/wireless/iwlwifi/dvm/power.c b/drivers/net/wireless/iwlwifi/dvm/power.c index bd69018..5194998 100644 --- a/drivers/net/wireless/iwlwifi/dvm/power.c +++ b/drivers/net/wireless/iwlwifi/dvm/power.c @@ -286,7 +286,8 @@ static int iwl_set_power(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd) static void iwl_power_build_cmd(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd) { - bool enabled = priv->hw->conf.flags & IEEE80211_CONF_PS; + bool enabled = ieee80211_conf_ps_mode(&priv->hw->conf) == + IEEE80211_PS_DOZE; int dtimper; dtimper = priv->hw->conf.ps_dtim_period ?: 1; diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index b73e497..3e4123e 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -1080,7 +1080,7 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed) conf->channel ? conf->channel->center_freq : 0, hwsim_chantypes[conf->channel_type], !!(conf->flags & IEEE80211_CONF_IDLE), - !!(conf->flags & IEEE80211_CONF_PS), + ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE, smps_modes[conf->smps_mode]); data->idle = !!(conf->flags & IEEE80211_CONF_IDLE); diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index 9ba8510..ed808c8 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c @@ -601,7 +601,7 @@ int p54_set_ps(struct p54_common *priv) unsigned int i; u16 mode; - if (priv->hw->conf.flags & IEEE80211_CONF_PS && + if (ieee80211_conf_ps_mode(&priv->hw->conf) == IEEE80211_PS_DOZE && !priv->powersave_override) mode = P54_PSM | P54_PSM_BEACON_TIMEOUT | P54_PSM_DTIM | P54_PSM_CHECKSUM | P54_PSM_MCBC; diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 12f0a34..2e166be 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -380,7 +380,8 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) skb_pull(skb, header_len); skb_trim(skb, le16_to_cpu(hdr->len)); - if (unlikely(priv->hw->conf.flags & IEEE80211_CONF_PS)) + if (unlikely(ieee80211_conf_ps_mode(&priv->hw->conf) == + IEEE80211_PS_DOZE)) p54_pspoll_workaround(priv, skb); ieee80211_rx_irqsafe(priv->hw, skb); diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index a2d2bc2..203a217 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c @@ -521,7 +521,7 @@ static void rt2400pci_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u32 reg; diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 9bea10f..e4a7e12 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c @@ -570,7 +570,7 @@ static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u32 reg; diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 6b2e1e43..a411f4e 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -649,7 +649,7 @@ static void rt2500usb_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u16 reg; diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index a658b4b..acfb0a1 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2862,7 +2862,7 @@ static void rt2800_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u32 reg; diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index 49a63e9..8cdf525 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c @@ -261,7 +261,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) && test_bit(REQUIRE_PS_AUTOWAKE, &rt2x00dev->cap_flags) && (ieee80211_flags & IEEE80211_CONF_CHANGE_PS) && - (conf->flags & IEEE80211_CONF_PS)) { + ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE) { beacon_diff = (long)jiffies - (long)rt2x00dev->last_beacon; beacon_int = msecs_to_jiffies(rt2x00dev->beacon_int); @@ -274,7 +274,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, autowake_timeout - 15); } - if (conf->flags & IEEE80211_CONF_PS) + if (ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE) set_bit(CONFIG_POWERSAVING, &rt2x00dev->flags); else clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags); diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 1031db6..a837132 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -596,7 +596,8 @@ static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev, * configured, or if the device is already in powersaving mode * we can exit now. */ if (likely(!ieee80211_is_beacon(hdr->frame_control) || - !(rt2x00dev->hw->conf.flags & IEEE80211_CONF_PS))) + ieee80211_conf_ps_mode(&rt2x00dev->hw->conf) != + IEEE80211_PS_DOZE)) return; /* min. beacon length + FCS_LEN */ diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index f95792c..c9d3e37 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -942,7 +942,7 @@ static void rt61pci_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u32 reg; diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 24eec66..719e781 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -827,7 +827,7 @@ static void rt73usb_config_ps(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_conf *libconf) { enum dev_state state = - (libconf->conf->flags & IEEE80211_CONF_PS) ? + ieee80211_conf_ps_mode(libconf->conf) == IEEE80211_PS_DOZE ? STATE_SLEEP : STATE_AWAKE; u32 reg; diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index d3ce9fb..69d6d08 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c @@ -289,7 +289,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed) if (changed & IEEE80211_CONF_CHANGE_PS) { cancel_delayed_work(&rtlpriv->works.ps_work); cancel_delayed_work(&rtlpriv->works.ps_rfon_wq); - if (conf->flags & IEEE80211_CONF_PS) { + if (ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE) { rtlpriv->psc.sw_ps_enabled = true; /* sleep here is must, or we may recv the beacon and * cause mac80211 into wrong ps state, this will cause diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 13ad33e..14babaf 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c @@ -468,7 +468,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) if (rtlpriv->psc.fwctrl_lps) return; - if (likely(!(hw->conf.flags & IEEE80211_CONF_PS))) + if (likely(ieee80211_conf_ps_mode(&hw->conf) != IEEE80211_PS_DOZE)) return; /* check if this really is a beacon */ @@ -624,7 +624,7 @@ void rtl_swlps_wq_callback(void *data) struct rtl_priv *rtlpriv = rtl_priv(hw); bool ps = false; - ps = (hw->conf.flags & IEEE80211_CONF_PS); + ps = ieee80211_conf_ps_mode(&hw->conf) == IEEE80211_PS_DOZE; /* we can sleep after ps null send ok */ if (rtlpriv->psc.state_inap) { diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index f47e8b0..57bea2f 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -576,7 +576,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) wl1251_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d", channel, - conf->flags & IEEE80211_CONF_PS ? "on" : "off", + ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE ? + "on" : "off", conf->power_level); mutex_lock(&wl->mutex); @@ -594,7 +595,8 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) goto out_sleep; } - if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) { + if (ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE && + !wl->psm_requested) { wl1251_debug(DEBUG_PSM, "psm enabled"); wl->psm_requested = true; @@ -610,7 +612,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE); if (ret < 0) goto out_sleep; - } else if (!(conf->flags & IEEE80211_CONF_PS) && + } else if (ieee80211_conf_ps_mode(conf) != IEEE80211_PS_DOZE && wl->psm_requested) { wl1251_debug(DEBUG_PSM, "psm disabled"); diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index e1dfdf9..c67005f 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -2901,7 +2901,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) wl1271_debug(DEBUG_MAC80211, "mac80211 config psm %s power %d %s" " changed 0x%x", - conf->flags & IEEE80211_CONF_PS ? "on" : "off", + ieee80211_conf_ps_mode(conf) == IEEE80211_PS_DOZE ? + "on" : "off", conf->power_level, conf->flags & IEEE80211_CONF_IDLE ? "idle" : "in use", changed); diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5c98d65..024c495 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -858,13 +858,16 @@ struct ieee80211_rx_status { * @IEEE80211_CONF_MONITOR: there's a monitor interface present -- use this * to determine for example whether to calculate timestamps for packets * or not, do not use instead of filter flags! - * @IEEE80211_CONF_PS: Enable 802.11 power save mode (managed mode only). - * This is the power save mode defined by IEEE 802.11-2007 section 11.2, - * meaning that the hardware still wakes up for beacons, is able to - * transmit frames and receive the possible acknowledgment frames. - * Not to be confused with hardware specific wakeup/sleep states, - * driver is responsible for that. See the section "Powersave support" - * for more. + * @IEEE80211_CONF_PS_MASK: This mask defines the bits which identify the + * 802.11 power save mode defined by IEEE 802.11-2007 section 11.2. + * Possible values for this field are defined by the subsequent + * IEEE80211_PS_* flags. See the section "Powersave support" for more. + * @IEEE80211_PS_AWAKE: The hardware is fully awake and is able to transmit + * and receive frames. + * @IEEE80211_PS_DOZE: The hardware is in a low-power state. It still wakes + * up for beacons and is able to transmit and receive the possible + * acknowledgement frames. Not to be confused with hardware specific + * wakeup/sleep states; the driver is responsible for that. * @IEEE80211_CONF_IDLE: The device is running, but idle; if the flag is set * the driver should be prepared to handle configuration requests but * may turn the device off as much as possible. Typically, this flag will @@ -875,9 +878,11 @@ struct ieee80211_rx_status { */ enum ieee80211_conf_flags { IEEE80211_CONF_MONITOR = (1<<0), - IEEE80211_CONF_PS = (1<<1), - IEEE80211_CONF_IDLE = (1<<2), - IEEE80211_CONF_OFFCHANNEL = (1<<3), + IEEE80211_CONF_PS_MASK = (3<<1), + IEEE80211_PS_AWAKE = (0<<1), + IEEE80211_PS_DOZE = (1<<1), + IEEE80211_CONF_IDLE = (1<<3), + IEEE80211_CONF_OFFCHANNEL = (1<<4), }; @@ -980,6 +985,18 @@ struct ieee80211_conf { }; /** + * ieee80211_conf_ps_mode - get powersave mode + * + * Returns the current powersave mode from the supplied configuration. + * + * @conf: device configuration + */ +static inline u32 ieee80211_conf_ps_mode(struct ieee80211_conf *conf) +{ + return conf->flags & IEEE80211_CONF_PS_MASK; +} + +/** * struct ieee80211_channel_switch - holds the channel switch data * * The information provided in this structure is required for channel switch @@ -1641,13 +1658,13 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); * First, it can support hardware that handles all powersaving by itself, * such hardware should simply set the %IEEE80211_HW_SUPPORTS_PS hardware * flag. In that case, it will be told about the desired powersave mode - * with the %IEEE80211_CONF_PS flag depending on the association status. + * with ieee80211_conf_ps_mode() depending on the association status. * The hardware must take care of sending nullfunc frames when necessary, * i.e. when entering and leaving powersave mode. The hardware is required * to look at the AID in beacons and signal to the AP that it woke up when * it finds traffic directed to it. * - * %IEEE80211_CONF_PS flag enabled means that the powersave mode defined in + * The %IEEE80211_PS_DOZE mode means that the powersave mode defined in * IEEE 802.11-2007 section 11.2 is enabled. This is not to be confused * with hardware wakeup and sleep states. Driver is responsible for waking * up the hardware before issuing commands to the hardware and putting it @@ -1679,9 +1696,9 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); * %IEEE80211_HW_SUPPORTS_DYNAMIC_PS flag to indicate that it can support * dynamic PS mode itself. The driver needs to look at the * @dynamic_ps_timeout hardware configuration value and use it that value - * whenever %IEEE80211_CONF_PS is set. In this case mac80211 will disable - * dynamic PS feature in stack and will just keep %IEEE80211_CONF_PS - * enabled whenever user has enabled powersave. + * whenever the mode is %IEEE80211_PS_DOZE. In this case mac80211 will disable + * dynamic PS feature in stack and will just set %IEEE80211_PS_DOZE whenever + * the user has enabled powersave. * * Some hardware need to toggle a single shared antenna between WLAN and * Bluetooth to facilitate co-existence. These types of hardware set @@ -1716,9 +1733,9 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); * * Beacon filter support is advertised with the %IEEE80211_VIF_BEACON_FILTER * interface capability. The driver needs to enable beacon filter support - * whenever power save is enabled, that is %IEEE80211_CONF_PS is set. When - * power save is enabled, the stack will not check for beacon loss and the - * driver needs to notify about loss of beacons with ieee80211_beacon_loss(). + * whenever the powersave mode is %IEEE80211_PS_DOZE. When in the doze state, + * the stack will not check for beacon loss and the driver needs to notify + * about loss of beacons with ieee80211_beacon_loss(). * * The time (or number of beacons missed) until the firmware notifies the * driver of a beacon loss event (which in turn causes the driver to call @@ -3864,8 +3881,8 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, * @vif: &struct ieee80211_vif pointer from the add_interface callback. * * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER and - * %IEEE80211_CONF_PS is set, the driver needs to inform whenever the - * hardware is not receiving beacons with this function. + * the powersave mode is %IEEE80211_PS_DOZE, the driver needs to inform + * whenever the hardware is not receiving beacons with this function. */ void ieee80211_beacon_loss(struct ieee80211_vif *vif); @@ -3874,9 +3891,10 @@ void ieee80211_beacon_loss(struct ieee80211_vif *vif); * * @vif: &struct ieee80211_vif pointer from the add_interface callback. * - * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER, and - * %IEEE80211_CONF_PS and %IEEE80211_HW_CONNECTION_MONITOR are set, the driver - * needs to inform if the connection to the AP has been lost. + * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER, the + * powersave mode is %IEEE80211_PS_DOZE, and %IEEE80211_HW_CONNECTION_MONITOR + * is set, the driver needs to inform if the connection to the AP has been + * lost. * * This function will cause immediate change to disassociated state, * without connection recovery attempts. diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 8adfdfb..0b0662f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1290,6 +1290,13 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, void ieee80211_configure_filter(struct ieee80211_local *local); u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); +static inline void +ieee80211_conf_set_ps_mode(struct ieee80211_conf *conf, u32 mode) +{ + conf->flags = (conf->flags & ~IEEE80211_CONF_PS_MASK) | + (mode & IEEE80211_CONF_PS_MASK); +} + /* STA code */ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata); int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 0f4e21f..7afcc73 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1004,7 +1004,7 @@ static void ieee80211_enable_ps(struct ieee80211_local *local, (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)) return; - conf->flags |= IEEE80211_CONF_PS; + ieee80211_conf_set_ps_mode(conf, IEEE80211_PS_DOZE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } } @@ -1015,8 +1015,8 @@ static void ieee80211_change_ps(struct ieee80211_local *local) if (local->ps_sdata) { ieee80211_enable_ps(local, local->ps_sdata); - } else if (conf->flags & IEEE80211_CONF_PS) { - conf->flags &= ~IEEE80211_CONF_PS; + } else if (ieee80211_conf_ps_mode(conf) != IEEE80211_PS_AWAKE) { + ieee80211_conf_set_ps_mode(conf, IEEE80211_PS_AWAKE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); del_timer_sync(&local->dynamic_ps_timer); cancel_work_sync(&local->dynamic_ps_enable_work); @@ -1149,9 +1149,10 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work) struct ieee80211_local *local = container_of(work, struct ieee80211_local, dynamic_ps_disable_work); + struct ieee80211_conf *conf = &local->hw.conf; - if (local->hw.conf.flags & IEEE80211_CONF_PS) { - local->hw.conf.flags &= ~IEEE80211_CONF_PS; + if (ieee80211_conf_ps_mode(conf) != IEEE80211_PS_AWAKE) { + ieee80211_conf_set_ps_mode(conf, IEEE80211_PS_AWAKE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } @@ -1175,7 +1176,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) ifmgd = &sdata->u.mgd; - if (local->hw.conf.flags & IEEE80211_CONF_PS) + if (ieee80211_conf_ps_mode(&local->hw.conf) == IEEE80211_PS_DOZE) return; if (!local->disable_dynamic_ps && @@ -1226,7 +1227,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)) || (ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED)) { ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED; - local->hw.conf.flags |= IEEE80211_CONF_PS; + ieee80211_conf_set_ps_mode(&local->hw.conf, IEEE80211_PS_DOZE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } @@ -1523,8 +1524,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, * to do it before sending disassoc, as otherwise the null-packet * won't be valid. */ - if (local->hw.conf.flags & IEEE80211_CONF_PS) { - local->hw.conf.flags &= ~IEEE80211_CONF_PS; + if (ieee80211_conf_ps_mode(&local->hw.conf) != IEEE80211_PS_AWAKE) { + ieee80211_conf_set_ps_mode(&local->hw.conf, IEEE80211_PS_AWAKE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } local->ps_sdata = NULL; @@ -2658,8 +2659,10 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ifmgd->aid); if (directed_tim) { if (local->hw.conf.dynamic_ps_timeout > 0) { - if (local->hw.conf.flags & IEEE80211_CONF_PS) { - local->hw.conf.flags &= ~IEEE80211_CONF_PS; + if (ieee80211_conf_ps_mode(&local->hw.conf) != + IEEE80211_PS_AWAKE) { + ieee80211_conf_set_ps_mode(&local->hw.conf, + IEEE80211_PS_AWAKE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 28274f9..22bba7a 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -40,9 +40,9 @@ static bool ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata) cancel_work_sync(&local->dynamic_ps_enable_work); - if (local->hw.conf.flags & IEEE80211_CONF_PS) { + if (ieee80211_conf_ps_mode(&local->hw.conf) == IEEE80211_PS_DOZE) { local->offchannel_ps_enabled = true; - local->hw.conf.flags &= ~IEEE80211_CONF_PS; + ieee80211_conf_set_ps_mode(&local->hw.conf, IEEE80211_PS_AWAKE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } @@ -87,11 +87,11 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata) /* TODO: Only set hardware if CONF_PS changed? * TODO: Should we set offchannel_ps_enabled to false? */ - local->hw.conf.flags |= IEEE80211_CONF_PS; + ieee80211_conf_set_ps_mode(&local->hw.conf, IEEE80211_PS_DOZE); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } else if (local->hw.conf.dynamic_ps_timeout > 0) { /* - * If IEEE80211_CONF_PS was not set and the dynamic_ps_timer + * If the powersave mode was awake and the dynamic_ps_timer * had been running before leaving the operating channel, * restart the timer now and send a nullfunc frame to inform * the AP that we are awake. diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 2619f4a..2572647 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -231,7 +231,7 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx) skb_get_queue_mapping(tx->skb) == IEEE80211_AC_VO) return TX_CONTINUE; - if (local->hw.conf.flags & IEEE80211_CONF_PS) { + if (ieee80211_conf_ps_mode(&local->hw.conf) == IEEE80211_PS_DOZE) { ieee80211_stop_queues_by_reason(&local->hw, IEEE80211_QUEUE_STOP_REASON_PS); ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED; diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 5259557..0f47a71 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1590,7 +1590,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) * explicitly send a null packet in order to make sure * it'll sync against the ap (and get out of psm). */ - if (!(local->hw.conf.flags & IEEE80211_CONF_PS)) { + if (ieee80211_conf_ps_mode(&local->hw.conf) == IEEE80211_PS_AWAKE) { list_for_each_entry(sdata, &local->interfaces, list) { if (sdata->vif.type != NL80211_IFTYPE_STATION) continue;
The powersave configuration in struct ieee80211_conf is currently a binary state, either enabled or disabled. This is inadequate for expressing the situation during off-channel operation, when powersave is set at the AP to request bufferring of frames but the hardware remains fully awake. Some drivers (e.g. brcmsmac) need to perform configuration to support this in-between state but lack the information to do so. To prepare for adding an off-channel powersave mode, expand the current powersave configuration flag to two bits to support expressing another state. Add helper functions for setting and retrieving the state, and convert mac80211 and drivers to use these functions. In changing from a binary flag to powersave mode, also update the terminology used to name the states for clarity. The "enabled" state is changed to "doze" to indicate a low power hardware state, and the "disabled" state is changed to "awake" to indicate a fully powerd on hardware state. This is consistent with the terminology defined in IEEE 802.11-2012 section 10.2.1.2. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> --- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 2 +- drivers/net/wireless/ath/carl9170/main.c | 3 +- drivers/net/wireless/ath/carl9170/rx.c | 2 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 +- drivers/net/wireless/iwlwifi/dvm/power.c | 3 +- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/p54/fwio.c | 2 +- drivers/net/wireless/p54/txrx.c | 3 +- drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2x00config.c | 4 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +- drivers/net/wireless/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- drivers/net/wireless/rtlwifi/core.c | 2 +- drivers/net/wireless/rtlwifi/ps.c | 4 +- drivers/net/wireless/ti/wl1251/main.c | 8 ++- drivers/net/wireless/ti/wlcore/main.c | 3 +- include/net/mac80211.h | 64 +++++++++++++------- net/mac80211/ieee80211_i.h | 7 +++ net/mac80211/mlme.c | 25 ++++---- net/mac80211/offchannel.c | 8 +-- net/mac80211/tx.c | 2 +- net/mac80211/util.c | 2 +- 27 files changed, 101 insertions(+), 65 deletions(-)