openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6656: mac80211 conversion: enable power saving 

Convert vnt_enable_power_saving and vnt_disable_power_saving

Remove mgmt->wCurrAID and use priv->current_aid

We nolonger send the PSbSendNullPacket from vnt_enable_power_saving

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-06-25 21:14:29 +01:00 committed by Greg Kroah-Hartman
parent ee61fde207
commit bbdf1bd4d8
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/vt6656/power.c
View File

@ -60,8 +60,7 @@ static int msglevel = MSG_LEVEL_INFO;
void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval) void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
{ {
struct vnt_manager *mgmt = &priv->vnt_mgmt; u16 aid = priv->current_aid | BIT(14) | BIT(15);
u16 aid = mgmt->wCurrAID | BIT14 | BIT15;
/* set period of power up before TBTT */ /* set period of power up before TBTT */
vnt_mac_write_word(priv, MAC_REG_PWBT, C_PWBT); vnt_mac_write_word(priv, MAC_REG_PWBT, C_PWBT);
@ -92,26 +91,12 @@ void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
/* first time set listen next beacon */ /* first time set listen next beacon */
vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_LNBCN); vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_LNBCN);
mgmt->wCountToWakeUp = listen_interval;
} else { } else {
/* always listen beacon */ /* always listen beacon */
vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_ALBCN); vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_ALBCN);
mgmt->wCountToWakeUp = 0;
} }
priv->bEnablePSMode = true;
/* We don't send null pkt in ad hoc mode
* since beacon will handle this.
*/
if (priv->op_mode == NL80211_IFTYPE_STATION)
PSbSendNullPacket(priv);
priv->bPWBitOn = true;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable...\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable...\n");
} }
@ -137,12 +122,6 @@ void vnt_disable_power_saving(struct vnt_private *priv)
/* set always listen beacon */ /* set always listen beacon */
vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_ALBCN); vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_ALBCN);
priv->bEnablePSMode = false;
if (priv->op_mode == NL80211_IFTYPE_STATION)
PSbSendNullPacket(priv);
priv->bPWBitOn = false;
} }
/* /*