Skip to content

L
linux
Commit 9f17b076 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Make functions static 

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9c100d50
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 32 deletions
drivers/staging/rtl8192e/r8192E.h
View file @ 9f17b076
...@@ -1048,27 +1048,17 @@ void write_nic_byte(struct r8192_priv *priv, int x,u8 y); ...@@ -1048,27 +1048,17 @@ void write_nic_byte(struct r8192_priv *priv, int x,u8 y);
void write_nic_word(struct r8192_priv *priv, int x,u16 y); void write_nic_word(struct r8192_priv *priv, int x,u16 y);
void write_nic_dword(struct r8192_priv *priv, int x,u32 y); void write_nic_dword(struct r8192_priv *priv, int x,u32 y);
void rtl8192_halt_adapter(struct net_device *dev, bool reset);
void rtl8192_rx_enable(struct net_device *);
void rtl8192_tx_enable(struct net_device *);
void rtl8192_update_msr(struct net_device *dev);
int rtl8192_down(struct net_device *dev); int rtl8192_down(struct net_device *dev);
int rtl8192_up(struct net_device *dev); int rtl8192_up(struct net_device *dev);
void rtl8192_commit(struct net_device *dev); void rtl8192_commit(struct net_device *dev);
void rtl8192_set_chan(struct net_device *dev,short ch);
void write_phy(struct net_device *dev, u8 adr, u8 data); void write_phy(struct net_device *dev, u8 adr, u8 data);
void write_phy_cck(struct net_device *dev, u8 adr, u32 data);
void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);
void CamResetAllEntry(struct net_device* dev); void CamResetAllEntry(struct net_device* dev);
void EnableHWSecurityConfig8192(struct net_device *dev); void EnableHWSecurityConfig8192(struct net_device *dev);
void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent ); void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent );
void dm_cck_txpower_adjust(struct net_device *dev, bool binch14); void dm_cck_txpower_adjust(struct net_device *dev, bool binch14);
void firmware_init_param(struct net_device *dev); void firmware_init_param(struct net_device *dev);
RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len); RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);
void rtl8192_hw_wakeup_wq (struct work_struct *work);
short rtl8192_is_tx_queue_empty(struct net_device *dev);
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
void IPSEnter(struct net_device *dev); void IPSEnter(struct net_device *dev);
void IPSLeave(struct net_device *dev); void IPSLeave(struct net_device *dev);
...@@ -1085,6 +1075,5 @@ void LeisurePSLeave(struct net_device *dev); ...@@ -1085,6 +1075,5 @@ void LeisurePSLeave(struct net_device *dev);
bool NicIFEnableNIC(struct net_device* dev); bool NicIFEnableNIC(struct net_device* dev);
bool NicIFDisableNIC(struct net_device* dev); bool NicIFDisableNIC(struct net_device* dev);
void rtl8192_irq_disable(struct net_device *dev);
void PHY_SetRtl8192eRfOff(struct net_device* dev); void PHY_SetRtl8192eRfOff(struct net_device* dev);
#endif #endif
drivers/staging/rtl8192e/r8192E_core.c
View file @ 9f17b076
...@@ -595,7 +595,7 @@ static void rtl8192_proc_init_one(struct net_device *dev) ...@@ -595,7 +595,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
} }
} }
short check_nic_enough_desc(struct net_device *dev, int prio) static short check_nic_enough_desc(struct net_device *dev, int prio)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
...@@ -620,7 +620,7 @@ static void rtl8192_irq_enable(struct net_device *dev) ...@@ -620,7 +620,7 @@ static void rtl8192_irq_enable(struct net_device *dev)
write_nic_dword(priv, INTA_MASK, priv->irq_mask); write_nic_dword(priv, INTA_MASK, priv->irq_mask);
} }
void rtl8192_irq_disable(struct net_device *dev) static void rtl8192_irq_disable(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
...@@ -628,7 +628,7 @@ void rtl8192_irq_disable(struct net_device *dev) ...@@ -628,7 +628,7 @@ void rtl8192_irq_disable(struct net_device *dev)
synchronize_irq(dev->irq); synchronize_irq(dev->irq);
} }
void rtl8192_update_msr(struct net_device *dev) static void rtl8192_update_msr(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
u8 msr; u8 msr;
...@@ -656,7 +656,7 @@ void rtl8192_update_msr(struct net_device *dev) ...@@ -656,7 +656,7 @@ void rtl8192_update_msr(struct net_device *dev)
write_nic_byte(priv, MSR, msr); write_nic_byte(priv, MSR, msr);
} }
void rtl8192_set_chan(struct net_device *dev,short ch) static void rtl8192_set_chan(struct net_device *dev,short ch)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
...@@ -668,7 +668,7 @@ void rtl8192_set_chan(struct net_device *dev,short ch) ...@@ -668,7 +668,7 @@ void rtl8192_set_chan(struct net_device *dev,short ch)
priv->rf_set_chan(dev, priv->chan); priv->rf_set_chan(dev, priv->chan);
} }
void rtl8192_rx_enable(struct net_device *dev) static void rtl8192_rx_enable(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
...@@ -687,7 +687,7 @@ void rtl8192_rx_enable(struct net_device *dev) ...@@ -687,7 +687,7 @@ void rtl8192_rx_enable(struct net_device *dev)
* BEACON_QUEUE ===> 8 * BEACON_QUEUE ===> 8
* */ * */
static const u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA}; static const u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA};
void rtl8192_tx_enable(struct net_device *dev) static void rtl8192_tx_enable(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
u32 i; u32 i;
...@@ -762,7 +762,7 @@ void PHY_SetRtl8192eRfOff(struct net_device* dev) ...@@ -762,7 +762,7 @@ void PHY_SetRtl8192eRfOff(struct net_device* dev)
} }
void rtl8192_halt_adapter(struct net_device *dev, bool reset) static void rtl8192_halt_adapter(struct net_device *dev, bool reset)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
int i; int i;
...@@ -819,13 +819,6 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset) ...@@ -819,13 +819,6 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
skb_queue_purge(&priv->skb_queue); skb_queue_purge(&priv->skb_queue);
} }
static const u16 rtl_rate[] = {10,20,55,110,60,90,120,180,240,360,480,540};
inline u16 rtl8192_rate2rate(short rate)
{
if (rate >11) return 0;
return rtl_rate[rate];
}
static void rtl8192_data_hard_stop(struct net_device *dev) static void rtl8192_data_hard_stop(struct net_device *dev)
{ {
} }
...@@ -1065,7 +1058,7 @@ static void rtl8192_net_update(struct net_device *dev) ...@@ -1065,7 +1058,7 @@ static void rtl8192_net_update(struct net_device *dev)
} }
} }
void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb) static void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
struct rtl8192_tx_ring *ring; struct rtl8192_tx_ring *ring;
...@@ -1831,7 +1824,7 @@ static bool GetHalfNmodeSupportByAPs819xPci(struct net_device* dev) ...@@ -1831,7 +1824,7 @@ static bool GetHalfNmodeSupportByAPs819xPci(struct net_device* dev)
return ieee->bHalfWirelessN24GMode; return ieee->bHalfWirelessN24GMode;
} }
short rtl8192_is_tx_queue_empty(struct net_device *dev) static short rtl8192_is_tx_queue_empty(struct net_device *dev)
{ {
int i=0; int i=0;
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
...@@ -1889,7 +1882,7 @@ static void rtl8192_hw_wakeup(struct net_device* dev) ...@@ -1889,7 +1882,7 @@ static void rtl8192_hw_wakeup(struct net_device* dev)
MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS);
} }
void rtl8192_hw_wakeup_wq (struct work_struct *work) static void rtl8192_hw_wakeup_wq (struct work_struct *work)
{ {
struct delayed_work *dwork = container_of(work,struct delayed_work,work); struct delayed_work *dwork = container_of(work,struct delayed_work,work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_wakeup_wq); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_wakeup_wq);
......
drivers/staging/rtl8192e/r8192E_wx.c
View file @ 9f17b076
...@@ -1149,7 +1149,7 @@ static iw_handler r8192_private_handler[] = { ...@@ -1149,7 +1149,7 @@ static iw_handler r8192_private_handler[] = {
r8192_wx_adapter_power_status, r8192_wx_adapter_power_status,
}; };
struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev) static struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
struct ieee80211_device* ieee = priv->ieee80211; struct ieee80211_device* ieee = priv->ieee80211;
......
drivers/staging/rtl8192e/r8192E_wx.h
View file @ 9f17b076
...@@ -14,8 +14,5 @@ ...@@ -14,8 +14,5 @@
#ifndef R8180_WX_H #ifndef R8180_WX_H
#define R8180_WX_H #define R8180_WX_H
//#include <linux/wireless.h>
extern struct iw_handler_def r8192_wx_handlers_def; extern struct iw_handler_def r8192_wx_handlers_def;
/* Enable the rtl819x_core.c to share this function, david 2008.9.22 */
struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7