diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-03-03 08:44:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 16:31:42 -0500 |
commit | 774dee1c1af9dd4994d5055bf2507c9ad72991e3 (patch) | |
tree | 81f23644a98723b64d037f9fca7a3d6fadfc725f /drivers/staging/rtl8192e/ieee80211 | |
parent | 8e0af57d9eb893a27e35d09e29d89b974a5d375d (diff) |
staging: rtl8192e: Move variables to ieee80211 struct
Move variables only accessed by the RTL ieee80211 library into its
private struct.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211')
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | 27 |
2 files changed, 15 insertions, 16 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 8ebedd0be77..2c5750bfe98 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h | |||
@@ -1811,8 +1811,6 @@ typedef struct _RT_POWER_SAVE_CONTROL | |||
1811 | bool bLeisurePs; | 1811 | bool bLeisurePs; |
1812 | u32 PowerProfile; | 1812 | u32 PowerProfile; |
1813 | u8 LpsIdleCount; | 1813 | u8 LpsIdleCount; |
1814 | u8 RegMaxLPSAwakeIntvl; | ||
1815 | u8 LPSAwakeIntvl; | ||
1816 | 1814 | ||
1817 | u32 CurPsLevel; | 1815 | u32 CurPsLevel; |
1818 | u32 RegRfPsLevel; | 1816 | u32 RegRfPsLevel; |
@@ -2200,6 +2198,8 @@ struct ieee80211_device { | |||
2200 | 2198 | ||
2201 | /* for PS mode */ | 2199 | /* for PS mode */ |
2202 | unsigned long last_rx_ps_time; | 2200 | unsigned long last_rx_ps_time; |
2201 | u8 LPSAwakeIntvl; | ||
2202 | u8 RegMaxLPSAwakeIntvl; | ||
2203 | 2203 | ||
2204 | /* used if IEEE_SOFTMAC_SINGLE_QUEUE is set */ | 2204 | /* used if IEEE_SOFTMAC_SINGLE_QUEUE is set */ |
2205 | struct sk_buff *mgmt_queue_ring[MGMT_QUEUE_NUM]; | 2205 | struct sk_buff *mgmt_queue_ring[MGMT_QUEUE_NUM]; |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index 012256c0fc5..88a9cd1958a 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -1738,7 +1738,6 @@ short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *ti | |||
1738 | { | 1738 | { |
1739 | int timeout = ieee->ps_timeout; | 1739 | int timeout = ieee->ps_timeout; |
1740 | u8 dtim; | 1740 | u8 dtim; |
1741 | PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(ieee->PowerSaveControl)); | ||
1742 | 1741 | ||
1743 | if(ieee->LPSDelayCnt) | 1742 | if(ieee->LPSDelayCnt) |
1744 | { | 1743 | { |
@@ -1767,35 +1766,35 @@ short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *ti | |||
1767 | 1766 | ||
1768 | if(time_l){ | 1767 | if(time_l){ |
1769 | if(ieee->bAwakePktSent == true) { | 1768 | if(ieee->bAwakePktSent == true) { |
1770 | pPSC->LPSAwakeIntvl = 1;//tx wake one beacon | 1769 | ieee->LPSAwakeIntvl = 1;//tx wake one beacon |
1771 | } else { | 1770 | } else { |
1772 | u8 MaxPeriod = 1; | 1771 | u8 MaxPeriod = 1; |
1773 | 1772 | ||
1774 | if(pPSC->LPSAwakeIntvl == 0) | 1773 | if(ieee->LPSAwakeIntvl == 0) |
1775 | pPSC->LPSAwakeIntvl = 1; | 1774 | ieee->LPSAwakeIntvl = 1; |
1776 | if(pPSC->RegMaxLPSAwakeIntvl == 0) // Default (0x0 - eFastPs, 0xFF -DTIM, 0xNN - 0xNN * BeaconIntvl) | 1775 | if(ieee->RegMaxLPSAwakeIntvl == 0) // Default (0x0 - eFastPs, 0xFF -DTIM, 0xNN - 0xNN * BeaconIntvl) |
1777 | MaxPeriod = 1; // 1 Beacon interval | 1776 | MaxPeriod = 1; // 1 Beacon interval |
1778 | else if(pPSC->RegMaxLPSAwakeIntvl == 0xFF) // DTIM | 1777 | else if(ieee->RegMaxLPSAwakeIntvl == 0xFF) // DTIM |
1779 | MaxPeriod = ieee->current_network.dtim_period; | 1778 | MaxPeriod = ieee->current_network.dtim_period; |
1780 | else | 1779 | else |
1781 | MaxPeriod = pPSC->RegMaxLPSAwakeIntvl; | 1780 | MaxPeriod = ieee->RegMaxLPSAwakeIntvl; |
1782 | pPSC->LPSAwakeIntvl = (pPSC->LPSAwakeIntvl >= MaxPeriod) ? MaxPeriod : (pPSC->LPSAwakeIntvl + 1); | 1781 | ieee->LPSAwakeIntvl = (ieee->LPSAwakeIntvl >= MaxPeriod) ? MaxPeriod : (ieee->LPSAwakeIntvl + 1); |
1783 | } | 1782 | } |
1784 | { | 1783 | { |
1785 | u8 LPSAwakeIntvl_tmp = 0; | 1784 | u8 LPSAwakeIntvl_tmp = 0; |
1786 | u8 period = ieee->current_network.dtim_period; | 1785 | u8 period = ieee->current_network.dtim_period; |
1787 | u8 count = ieee->current_network.tim.tim_count; | 1786 | u8 count = ieee->current_network.tim.tim_count; |
1788 | if(count == 0 ) { | 1787 | if(count == 0 ) { |
1789 | if(pPSC->LPSAwakeIntvl > period) | 1788 | if(ieee->LPSAwakeIntvl > period) |
1790 | LPSAwakeIntvl_tmp = period + (pPSC->LPSAwakeIntvl - period) -((pPSC->LPSAwakeIntvl-period)%period); | 1789 | LPSAwakeIntvl_tmp = period + (ieee->LPSAwakeIntvl - period) -((ieee->LPSAwakeIntvl-period)%period); |
1791 | else | 1790 | else |
1792 | LPSAwakeIntvl_tmp = pPSC->LPSAwakeIntvl; | 1791 | LPSAwakeIntvl_tmp = ieee->LPSAwakeIntvl; |
1793 | 1792 | ||
1794 | } else { | 1793 | } else { |
1795 | if(pPSC->LPSAwakeIntvl > ieee->current_network.tim.tim_count) | 1794 | if(ieee->LPSAwakeIntvl > ieee->current_network.tim.tim_count) |
1796 | LPSAwakeIntvl_tmp = count + (pPSC->LPSAwakeIntvl - count) -((pPSC->LPSAwakeIntvl-count)%period); | 1795 | LPSAwakeIntvl_tmp = count + (ieee->LPSAwakeIntvl - count) -((ieee->LPSAwakeIntvl-count)%period); |
1797 | else | 1796 | else |
1798 | LPSAwakeIntvl_tmp = pPSC->LPSAwakeIntvl; | 1797 | LPSAwakeIntvl_tmp = ieee->LPSAwakeIntvl; |
1799 | } | 1798 | } |
1800 | 1799 | ||
1801 | *time_l = ieee->current_network.last_dtim_sta_time[0] | 1800 | *time_l = ieee->current_network.last_dtim_sta_time[0] |