Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
You need to sign in or sign up before continuing.
提交 1344ee25 编写于 作者: L Larry Finger 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII 

Signed-off-by: NLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 b6da7313
显示空白变更内容
内联 并排
Showing with 1562 addition and 1528 deletion
drivers/staging/rtl8192e/rtl_core.c
浏览文件 @ 1344ee25
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#undef DEBUG_TX_ALLOC #undef DEBUG_TX_ALLOC
#undef DEBUG_TX_DESC #undef DEBUG_TX_DESC
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include "rtl_core.h" #include "rtl_core.h"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
int hwwep = 1; int hwwep = 1;
static int channels = 0x3fff; static int channels = 0x3fff;
char* ifname = "wlan%d"; char *ifname = "wlan%d";
struct rtl819x_ops rtl819xp_ops = { struct rtl819x_ops rtl819xp_ops = {
...@@ -109,17 +109,13 @@ static struct pci_driver rtl8192_pci_driver = { ...@@ -109,17 +109,13 @@ static struct pci_driver rtl8192_pci_driver = {
/**************************************************************************** /****************************************************************************
-----------------------------IO STUFF------------------------- -----------------------------IO STUFF-------------------------
*****************************************************************************/ *****************************************************************************/
bool bool PlatformIOCheckPageLegalAndGetRegMask(u32 u4bPage, u8 *pu1bPageMask)
PlatformIOCheckPageLegalAndGetRegMask(
u32 u4bPage,
u8* pu1bPageMask
)
{ {
bool bReturn = false; bool bReturn = false;
*pu1bPageMask = 0xfe; *pu1bPageMask = 0xfe;
switch (u4bPage) switch (u4bPage) {
{
case 1: case 2: case 3: case 4: case 1: case 2: case 3: case 4:
case 8: case 9: case 10: case 12: case 13: case 8: case 9: case 10: case 12: case 13:
bReturn = true; bReturn = true;
...@@ -134,90 +130,74 @@ PlatformIOCheckPageLegalAndGetRegMask( ...@@ -134,90 +130,74 @@ PlatformIOCheckPageLegalAndGetRegMask(
return bReturn; return bReturn;
} }
void write_nic_io_byte(struct net_device *dev, int x,u8 y) void write_nic_io_byte(struct net_device *dev, int x, u8 y)
{ {
u32 u4bPage = (x >> 8); u32 u4bPage = (x >> 8);
u8 u1PageMask = 0; u8 u1PageMask = 0;
bool bIsLegalPage = false; bool bIsLegalPage = false;
if (u4bPage == 0) if (u4bPage == 0) {
{ outb(y&0xff, dev->base_addr + x);
outb(y&0xff,dev->base_addr +x);
}else } else {
{ bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); &u1PageMask);
if (bIsLegalPage) if (bIsLegalPage) {
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
write_nic_io_byte(dev, (x & 0xff), y); write_nic_io_byte(dev, (x & 0xff), y);
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
} }
void write_nic_io_word(struct net_device *dev, int x,u16 y) void write_nic_io_word(struct net_device *dev, int x, u16 y)
{ {
u32 u4bPage = (x >> 8); u32 u4bPage = (x >> 8);
u8 u1PageMask = 0; u8 u1PageMask = 0;
bool bIsLegalPage = false; bool bIsLegalPage = false;
if (u4bPage == 0) if (u4bPage == 0) {
{ outw(y, dev->base_addr + x);
outw(y,dev->base_addr +x); } else {
}else bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
{ &u1PageMask);
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); if (bIsLegalPage) {
if (bIsLegalPage)
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
write_nic_io_word(dev, (x & 0xff), y); write_nic_io_word(dev, (x & 0xff), y);
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
} }
void write_nic_io_dword(struct net_device *dev, int x,u32 y) void write_nic_io_dword(struct net_device *dev, int x, u32 y)
{ {
u32 u4bPage = (x >> 8); u32 u4bPage = (x >> 8);
u8 u1PageMask = 0; u8 u1PageMask = 0;
bool bIsLegalPage = false; bool bIsLegalPage = false;
if (u4bPage == 0) if (u4bPage == 0) {
{ outl(y, dev->base_addr + x);
outl(y,dev->base_addr +x); } else {
}else bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
{ &u1PageMask);
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); if (bIsLegalPage) {
if (bIsLegalPage)
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
write_nic_io_dword(dev, (x & 0xff), y); write_nic_io_dword(dev, (x & 0xff), y);
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
} }
u8 read_nic_io_byte(struct net_device *dev, int x) u8 read_nic_io_byte(struct net_device *dev, int x)
{ {
u32 u4bPage = (x >> 8); u32 u4bPage = (x >> 8);
...@@ -225,23 +205,18 @@ u8 read_nic_io_byte(struct net_device *dev, int x) ...@@ -225,23 +205,18 @@ u8 read_nic_io_byte(struct net_device *dev, int x)
bool bIsLegalPage = false; bool bIsLegalPage = false;
u8 Data = 0; u8 Data = 0;
if (u4bPage == 0) if (u4bPage == 0) {
{ return 0xff&inb(dev->base_addr + x);
return 0xff&inb(dev->base_addr +x); } else {
}else bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
{ &u1PageMask);
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); if (bIsLegalPage) {
if (bIsLegalPage)
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
Data = read_nic_io_byte(dev, (x & 0xff)); Data = read_nic_io_byte(dev, (x & 0xff));
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
...@@ -255,23 +230,19 @@ u16 read_nic_io_word(struct net_device *dev, int x) ...@@ -255,23 +230,19 @@ u16 read_nic_io_word(struct net_device *dev, int x)
bool bIsLegalPage = false; bool bIsLegalPage = false;
u16 Data = 0; u16 Data = 0;
if (u4bPage == 0) if (u4bPage == 0) {
{ return inw(dev->base_addr + x);
return inw(dev->base_addr +x); } else {
}else bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
{ &u1PageMask);
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); if (bIsLegalPage) {
if (bIsLegalPage)
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
Data = read_nic_io_word(dev, (x & 0xff)); Data = read_nic_io_word(dev, (x & 0xff));
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
...@@ -285,23 +256,19 @@ u32 read_nic_io_dword(struct net_device *dev, int x) ...@@ -285,23 +256,19 @@ u32 read_nic_io_dword(struct net_device *dev, int x)
bool bIsLegalPage = false; bool bIsLegalPage = false;
u32 Data = 0; u32 Data = 0;
if (u4bPage == 0) if (u4bPage == 0) {
{ return inl(dev->base_addr + x);
return inl(dev->base_addr +x); } else {
}else bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
{ &u1PageMask);
bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage, &u1PageMask); if (bIsLegalPage) {
if (bIsLegalPage)
{
u8 u1bPsr = read_nic_io_byte(dev, PSR); u8 u1bPsr = read_nic_io_byte(dev, PSR);
write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) | (u8)u4bPage)); write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
(u8)u4bPage));
Data = read_nic_io_dword(dev, (x & 0xff)); Data = read_nic_io_dword(dev, (x & 0xff));
write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask)); write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
}else
{
;
} }
} }
...@@ -310,36 +277,36 @@ u32 read_nic_io_dword(struct net_device *dev, int x) ...@@ -310,36 +277,36 @@ u32 read_nic_io_dword(struct net_device *dev, int x)
u8 read_nic_byte(struct net_device *dev, int x) u8 read_nic_byte(struct net_device *dev, int x)
{ {
return 0xff&readb((u8*)dev->mem_start +x); return 0xff & readb((u8 *)dev->mem_start + x);
} }
u32 read_nic_dword(struct net_device *dev, int x) u32 read_nic_dword(struct net_device *dev, int x)
{ {
return readl((u8*)dev->mem_start +x); return readl((u8 *)dev->mem_start + x);
} }
u16 read_nic_word(struct net_device *dev, int x) u16 read_nic_word(struct net_device *dev, int x)
{ {
return readw((u8*)dev->mem_start +x); return readw((u8 *)dev->mem_start + x);
} }
void write_nic_byte(struct net_device *dev, int x,u8 y) void write_nic_byte(struct net_device *dev, int x, u8 y)
{ {
writeb(y,(u8*)dev->mem_start +x); writeb(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
void write_nic_dword(struct net_device *dev, int x,u32 y) void write_nic_dword(struct net_device *dev, int x, u32 y)
{ {
writel(y,(u8*)dev->mem_start +x); writel(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
void write_nic_word(struct net_device *dev, int x,u16 y) void write_nic_word(struct net_device *dev, int x, u16 y)
{ {
writew(y,(u8*)dev->mem_start +x); writew(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
...@@ -347,53 +314,52 @@ void write_nic_word(struct net_device *dev, int x,u16 y) ...@@ -347,53 +314,52 @@ void write_nic_word(struct net_device *dev, int x,u16 y)
/**************************************************************************** /****************************************************************************
-----------------------------GENERAL FUNCTION------------------------- -----------------------------GENERAL FUNCTION-------------------------
*****************************************************************************/ *****************************************************************************/
bool bool MgntActSet_RF_State(struct net_device *dev,
MgntActSet_RF_State(
struct net_device* dev,
enum rt_rf_power_state StateToSet, enum rt_rf_power_state StateToSet,
RT_RF_CHANGE_SOURCE ChangeSource, RT_RF_CHANGE_SOURCE ChangeSource,
bool ProtectOrNot bool ProtectOrNot)
)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device * ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
bool bActionAllowed = false; bool bActionAllowed = false;
bool bConnectBySSID = false; bool bConnectBySSID = false;
enum rt_rf_power_state rtState; enum rt_rf_power_state rtState;
u16 RFWaitCounter = 0; u16 RFWaitCounter = 0;
unsigned long flag; unsigned long flag;
RT_TRACE((COMP_PS | COMP_RF), "===>MgntActSet_RF_State(): StateToSet(%d)\n",StateToSet); RT_TRACE((COMP_PS | COMP_RF), "===>MgntActSet_RF_State(): "
"StateToSet(%d)\n", StateToSet);
ProtectOrNot = false; ProtectOrNot = false;
if (!ProtectOrNot) if (!ProtectOrNot) {
{ while (true) {
while(true) spin_lock_irqsave(&priv->rf_ps_lock, flag);
{ if (priv->RFChangeInProgress) {
spin_lock_irqsave(&priv->rf_ps_lock,flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
if (priv->RFChangeInProgress) RT_TRACE((COMP_PS | COMP_RF),
{ "MgntActSet_RF_State(): RF Change in "
spin_unlock_irqrestore(&priv->rf_ps_lock,flag); "progress! Wait to set..StateToSet"
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): RF Change in progress! Wait to set..StateToSet(%d).\n", StateToSet); "(%d).\n", StateToSet);
while(priv->RFChangeInProgress) while (priv->RFChangeInProgress) {
{ RFWaitCounter++;
RFWaitCounter ++; RT_TRACE((COMP_PS | COMP_RF),
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): Wait 1 ms (%d times)...\n", RFWaitCounter); "MgntActSet_RF_State(): Wait 1"
" ms (%d times)...\n",
RFWaitCounter);
mdelay(1); mdelay(1);
if (RFWaitCounter > 100) if (RFWaitCounter > 100) {
{ RT_TRACE(COMP_ERR, "MgntActSet_"
RT_TRACE(COMP_ERR, "MgntActSet_RF_State(): Wait too logn to set RF\n"); "RF_State(): Wait too "
"logn to set RF\n");
return false; return false;
} }
} }
} } else {
else
{
priv->RFChangeInProgress = true; priv->RFChangeInProgress = true;
spin_unlock_irqrestore(&priv->rf_ps_lock,flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
break; break;
} }
} }
...@@ -401,52 +367,48 @@ MgntActSet_RF_State( ...@@ -401,52 +367,48 @@ MgntActSet_RF_State(
rtState = priv->rtllib->eRFPowerState; rtState = priv->rtllib->eRFPowerState;
switch (StateToSet) switch (StateToSet) {
{
case eRfOn: case eRfOn:
priv->rtllib->RfOffReason &= (~ChangeSource); priv->rtllib->RfOffReason &= (~ChangeSource);
if ((ChangeSource == RF_CHANGE_BY_HW) && (priv->bHwRadioOff == true)){ if ((ChangeSource == RF_CHANGE_BY_HW) &&
(priv->bHwRadioOff == true))
priv->bHwRadioOff = false; priv->bHwRadioOff = false;
}
if (! priv->rtllib->RfOffReason) if (!priv->rtllib->RfOffReason) {
{
priv->rtllib->RfOffReason = 0; priv->rtllib->RfOffReason = 0;
bActionAllowed = true; bActionAllowed = true;
if (rtState == eRfOff && ChangeSource >=RF_CHANGE_BY_HW ) if (rtState == eRfOff &&
{ ChangeSource >= RF_CHANGE_BY_HW)
bConnectBySSID = true; bConnectBySSID = true;
} } else {
} RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State - "
else{ "eRfon reject pMgntInfo->RfOffReason= 0x%x,"
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State - eRfon reject pMgntInfo->RfOffReason= 0x%x, ChangeSource=0x%X\n", priv->rtllib->RfOffReason, ChangeSource); " ChangeSource=0x%X\n",
priv->rtllib->RfOffReason, ChangeSource);
} }
break; break;
case eRfOff: case eRfOff:
if ((priv->rtllib->iw_mode == IW_MODE_INFRA) || (priv->rtllib->iw_mode == IW_MODE_ADHOC)) if ((priv->rtllib->iw_mode == IW_MODE_INFRA) ||
{ (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {
if ((priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) || (ChangeSource > RF_CHANGE_BY_IPS)) if ((priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) ||
{ (ChangeSource > RF_CHANGE_BY_IPS)) {
if (ieee->state == RTLLIB_LINKED) if (ieee->state == RTLLIB_LINKED)
priv->blinked_ingpio = true; priv->blinked_ingpio = true;
else else
priv->blinked_ingpio = false; priv->blinked_ingpio = false;
rtllib_MgntDisconnect(priv->rtllib,disas_lv_ss); rtllib_MgntDisconnect(priv->rtllib,
disas_lv_ss);
} }
} }
if ((ChangeSource == RF_CHANGE_BY_HW) && (priv->bHwRadioOff == false)){ if ((ChangeSource == RF_CHANGE_BY_HW) &&
(priv->bHwRadioOff == false))
priv->bHwRadioOff = true; priv->bHwRadioOff = true;
}
priv->rtllib->RfOffReason |= ChangeSource; priv->rtllib->RfOffReason |= ChangeSource;
bActionAllowed = true; bActionAllowed = true;
break; break;
...@@ -460,29 +422,30 @@ MgntActSet_RF_State( ...@@ -460,29 +422,30 @@ MgntActSet_RF_State(
break; break;
} }
if (bActionAllowed) if (bActionAllowed) {
{ RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): Action is"
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n", StateToSet, priv->rtllib->RfOffReason); " allowed.... StateToSet(%d), RfOffReason(%#X)\n",
StateToSet, priv->rtllib->RfOffReason);
PHY_SetRFPowerState(dev, StateToSet); PHY_SetRFPowerState(dev, StateToSet);
if (StateToSet == eRfOn) if (StateToSet == eRfOn) {
{
if (bConnectBySSID && (priv->blinked_ingpio == true)) if (bConnectBySSID && (priv->blinked_ingpio == true)) {
{ queue_delayed_work_rsl(ieee->wq,
queue_delayed_work_rsl(ieee->wq, &ieee->associate_procedure_wq, 0); &ieee->associate_procedure_wq, 0);
priv->blinked_ingpio = false; priv->blinked_ingpio = false;
} }
} }
} else { } else {
RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): Action is rejected.... StateToSet(%d), ChangeSource(%#X), RfOffReason(%#X)\n", StateToSet, ChangeSource, priv->rtllib->RfOffReason); RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): "
"Action is rejected.... StateToSet(%d), ChangeSource"
"(%#X), RfOffReason(%#X)\n", StateToSet, ChangeSource,
priv->rtllib->RfOffReason);
} }
if (!ProtectOrNot) if (!ProtectOrNot) {
{ spin_lock_irqsave(&priv->rf_ps_lock, flag);
spin_lock_irqsave(&priv->rf_ps_lock,flag);
priv->RFChangeInProgress = false; priv->RFChangeInProgress = false;
spin_unlock_irqrestore(&priv->rf_ps_lock,flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
} }
RT_TRACE((COMP_PS && COMP_RF), "<===MgntActSet_RF_State()\n"); RT_TRACE((COMP_PS && COMP_RF), "<===MgntActSet_RF_State()\n");
...@@ -498,9 +461,10 @@ short rtl8192_get_nic_desc_num(struct net_device *dev, int prio) ...@@ -498,9 +461,10 @@ short rtl8192_get_nic_desc_num(struct net_device *dev, int prio)
/* For now, we reserved two free descriptor as a safety boundary /* For now, we reserved two free descriptor as a safety boundary
* between the tail and the head * between the tail and the head
*/ */
if ((prio == MGNT_QUEUE) &&(skb_queue_len(&ring->queue)>10)) if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10))
RT_TRACE(COMP_DBG, "-----[%d]---------ring->idx=%d queue_len=%d---------\n", RT_TRACE(COMP_DBG, "-----[%d]---------ring->idx=%d "
prio,ring->idx, skb_queue_len(&ring->queue)); "queue_len=%d---------\n", prio, ring->idx,
skb_queue_len(&ring->queue));
return skb_queue_len(&ring->queue); return skb_queue_len(&ring->queue);
} }
...@@ -509,11 +473,9 @@ short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio) ...@@ -509,11 +473,9 @@ short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
if (ring->entries - skb_queue_len(&ring->queue) >= 2) { if (ring->entries - skb_queue_len(&ring->queue) >= 2)
return 1; return 1;
} else {
return 0; return 0;
}
} }
void rtl8192_tx_timeout(struct net_device *dev) void rtl8192_tx_timeout(struct net_device *dev)
...@@ -521,7 +483,7 @@ void rtl8192_tx_timeout(struct net_device *dev) ...@@ -521,7 +483,7 @@ void rtl8192_tx_timeout(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
schedule_work(&priv->reset_wq); schedule_work(&priv->reset_wq);
printk("TXTIMEOUT"); printk(KERN_INFO "TXTIMEOUT");
} }
void rtl8192_irq_enable(struct net_device *dev) void rtl8192_irq_enable(struct net_device *dev)
...@@ -549,7 +511,7 @@ void rtl8192_irq_clear(struct net_device *dev) ...@@ -549,7 +511,7 @@ void rtl8192_irq_clear(struct net_device *dev)
} }
void rtl8192_set_chan(struct net_device *dev,short ch) void rtl8192_set_chan(struct net_device *dev, short ch)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
...@@ -560,95 +522,91 @@ void rtl8192_set_chan(struct net_device *dev,short ch) ...@@ -560,95 +522,91 @@ void rtl8192_set_chan(struct net_device *dev,short ch)
priv->chan = ch; priv->chan = ch;
if (priv->rf_set_chan) if (priv->rf_set_chan)
priv->rf_set_chan(dev,priv->chan); priv->rf_set_chan(dev, priv->chan);
} }
void rtl8192_update_cap(struct net_device* dev, u16 cap) void rtl8192_update_cap(struct net_device *dev, u16 cap)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_network *net = &priv->rtllib->current_network; struct rtllib_network *net = &priv->rtllib->current_network;
{
bool ShortPreamble; bool ShortPreamble;
if (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) if (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) {
{ if (priv->dot11CurrentPreambleMode != PREAMBLE_SHORT) {
if (priv->dot11CurrentPreambleMode != PREAMBLE_SHORT)
{
ShortPreamble = true; ShortPreamble = true;
priv->dot11CurrentPreambleMode = PREAMBLE_SHORT; priv->dot11CurrentPreambleMode = PREAMBLE_SHORT;
RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_SHORT_PREAMBLE\n", __func__); RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_SHORT_"
priv->rtllib->SetHwRegHandler( dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble ); "PREAMBLE\n", __func__);
priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,
(unsigned char *)&ShortPreamble);
} }
} } else {
else if (priv->dot11CurrentPreambleMode != PREAMBLE_LONG) {
{
if (priv->dot11CurrentPreambleMode != PREAMBLE_LONG)
{
ShortPreamble = false; ShortPreamble = false;
priv->dot11CurrentPreambleMode = PREAMBLE_LONG; priv->dot11CurrentPreambleMode = PREAMBLE_LONG;
RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_LONG_PREAMBLE\n", __func__); RT_TRACE(COMP_DBG, "%s(): WLAN_CAPABILITY_LONG_"
priv->rtllib->SetHwRegHandler( dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble ); "PREAMBLE\n", __func__);
} priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,
(unsigned char *)&ShortPreamble);
} }
} }
if (net->mode & (IEEE_G|IEEE_N_24G)) if (net->mode & (IEEE_G|IEEE_N_24G)) {
{
u8 slot_time_val; u8 slot_time_val;
u8 CurSlotTime = priv->slot_time; u8 CurSlotTime = priv->slot_time;
if ((cap & WLAN_CAPABILITY_SHORT_SLOT_TIME) && (!priv->rtllib->pHTInfo->bCurrentRT2RTLongSlotTime)) if ((cap & WLAN_CAPABILITY_SHORT_SLOT_TIME) &&
{ (!priv->rtllib->pHTInfo->bCurrentRT2RTLongSlotTime)) {
if (CurSlotTime != SHORT_SLOT_TIME) if (CurSlotTime != SHORT_SLOT_TIME) {
{
slot_time_val = SHORT_SLOT_TIME; slot_time_val = SHORT_SLOT_TIME;
priv->rtllib->SetHwRegHandler( dev, HW_VAR_SLOT_TIME, &slot_time_val ); priv->rtllib->SetHwRegHandler(dev,
} HW_VAR_SLOT_TIME, &slot_time_val);
} }
else } else {
{ if (CurSlotTime != NON_SHORT_SLOT_TIME) {
if (CurSlotTime != NON_SHORT_SLOT_TIME)
{
slot_time_val = NON_SHORT_SLOT_TIME; slot_time_val = NON_SHORT_SLOT_TIME;
priv->rtllib->SetHwRegHandler( dev, HW_VAR_SLOT_TIME, &slot_time_val ); priv->rtllib->SetHwRegHandler(dev,
HW_VAR_SLOT_TIME, &slot_time_val);
} }
} }
} }
} }
static struct rtllib_qos_parameters def_qos_parameters = { static struct rtllib_qos_parameters def_qos_parameters = {
{3,3,3,3}, {3, 3, 3, 3},
{7,7,7,7}, {7, 7, 7, 7},
{2,2,2,2}, {2, 2, 2, 2},
{0,0,0,0}, {0, 0, 0, 0},
{0,0,0,0} {0, 0, 0, 0}
}; };
void rtl8192_update_beacon(void *data) void rtl8192_update_beacon(void *data)
{ {
struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, update_beacon_wq.work); struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
update_beacon_wq.work);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
struct rtllib_network* net = &ieee->current_network; struct rtllib_network *net = &ieee->current_network;
if (ieee->pHTInfo->bCurrentHTSupport) if (ieee->pHTInfo->bCurrentHTSupport)
HTUpdateSelfAndPeerSetting(ieee, net); HTUpdateSelfAndPeerSetting(ieee, net);
ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bdRT2RTLongSlotTime; ieee->pHTInfo->bCurrentRT2RTLongSlotTime =
net->bssht.bdRT2RTLongSlotTime;
ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode; ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;
rtl8192_update_cap(dev, net->capability); rtl8192_update_cap(dev, net->capability);
} }
#define MOVE_INTO_HANDLER #define MOVE_INTO_HANDLER
int WDCAPARA_ADD[] = {EDCAPARA_BE,EDCAPARA_BK,EDCAPARA_VI,EDCAPARA_VO}; int WDCAPARA_ADD[] = {EDCAPARA_BE, EDCAPARA_BK, EDCAPARA_VI, EDCAPARA_VO};
void rtl8192_qos_activate(void *data) void rtl8192_qos_activate(void *data)
{ {
struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, qos_activate); struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
qos_activate);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
#ifndef MOVE_INTO_HANDLER #ifndef MOVE_INTO_HANDLER
struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters; struct rtllib_qos_parameters *qos_parameters =
&priv->rtllib->current_network.qos_data.parameters;
u8 mode = priv->rtllib->current_network.mode; u8 mode = priv->rtllib->current_network.mode;
u8 u1bAIFS; u8 u1bAIFS;
u32 u4bAcParam; u32 u4bAcParam;
...@@ -661,19 +619,24 @@ void rtl8192_qos_activate(void *data) ...@@ -661,19 +619,24 @@ void rtl8192_qos_activate(void *data)
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
if (priv->rtllib->state != RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
goto success; goto success;
RT_TRACE(COMP_QOS,"qos active process with associate response received\n"); RT_TRACE(COMP_QOS, "qos active process with associate response "
"received\n");
for (i = 0; i < QOS_QUEUE_NUM; i++) { for (i = 0; i < QOS_QUEUE_NUM; i++) {
#ifndef MOVE_INTO_HANDLER #ifndef MOVE_INTO_HANDLER
u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G|IEEE_N_24G)) ?9:20) + aSifsTime; u1bAIFS = qos_parameters->aifs[i] *
u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i]))<< AC_PARAM_TXOP_LIMIT_OFFSET)| ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
(((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)| u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i])) <<
(((u32)(qos_parameters->cw_min[i]))<< AC_PARAM_ECW_MIN_OFFSET)| AC_PARAM_TXOP_LIMIT_OFFSET) |
(((u32)(qos_parameters->cw_max[i])) <<
AC_PARAM_ECW_MAX_OFFSET) |
(((u32)(qos_parameters->cw_min[i])) <<
AC_PARAM_ECW_MIN_OFFSET) |
((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET)); ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
RT_TRACE(COMP_DBG, "===>ACI:%d:u4bAcParam:%x\n", i, u4bAcParam); RT_TRACE(COMP_DBG, "===>ACI:%d:u4bAcParam:%x\n", i, u4bAcParam);
write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam); write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);
#else #else
priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8*)(&i)); priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i));
#endif #endif
} }
...@@ -688,7 +651,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -688,7 +651,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
int ret = 0; int ret = 0;
u32 size = sizeof(struct rtllib_qos_parameters); u32 size = sizeof(struct rtllib_qos_parameters);
if (priv->rtllib->state !=RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
return ret; return ret;
if ((priv->rtllib->iw_mode != IW_MODE_INFRA)) if ((priv->rtllib->iw_mode != IW_MODE_INFRA))
...@@ -707,16 +670,17 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -707,16 +670,17 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
network->qos_data.param_count; network->qos_data.param_count;
priv->rtllib->wmm_acm = network->qos_data.wmm_acm; priv->rtllib->wmm_acm = network->qos_data.wmm_acm;
queue_work_rsl(priv->priv_wq, &priv->qos_activate); queue_work_rsl(priv->priv_wq, &priv->qos_activate);
RT_TRACE (COMP_QOS, "QoS parameters change call " RT_TRACE(COMP_QOS, "QoS parameters change call "
"qos_activate\n"); "qos_activate\n");
} }
} else { } else {
memcpy(&priv->rtllib->current_network.qos_data.parameters,\ memcpy(&priv->rtllib->current_network.qos_data.parameters,
&def_qos_parameters, size); &def_qos_parameters, size);
if ((network->qos_data.active == 1) && (active_network == 1)) { if ((network->qos_data.active == 1) && (active_network == 1)) {
queue_work_rsl(priv->priv_wq, &priv->qos_activate); queue_work_rsl(priv->priv_wq, &priv->qos_activate);
RT_TRACE(COMP_QOS, "QoS was disabled call qos_activate \n"); RT_TRACE(COMP_QOS, "QoS was disabled call qos_"
"activate\n");
} }
network->qos_data.active = 0; network->qos_data.active = 0;
network->qos_data.supported = 0; network->qos_data.supported = 0;
...@@ -725,13 +689,13 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -725,13 +689,13 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
return 0; return 0;
} }
static int rtl8192_handle_beacon(struct net_device * dev, static int rtl8192_handle_beacon(struct net_device *dev,
struct rtllib_beacon * beacon, struct rtllib_beacon *beacon,
struct rtllib_network * network) struct rtllib_network *network)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
rtl8192_qos_handle_probe_response(priv,1,network); rtl8192_qos_handle_probe_response(priv, 1, network);
queue_delayed_work_rsl(priv->priv_wq, &priv->update_beacon_wq, 0); queue_delayed_work_rsl(priv->priv_wq, &priv->update_beacon_wq, 0);
return 0; return 0;
...@@ -749,7 +713,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv, ...@@ -749,7 +713,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
if ((priv == NULL) || (network == NULL)) if ((priv == NULL) || (network == NULL))
return ret; return ret;
if (priv->rtllib->state !=RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
return ret; return ret;
if ((priv->rtllib->iw_mode != IW_MODE_INFRA)) if ((priv->rtllib->iw_mode != IW_MODE_INFRA))
...@@ -757,8 +721,8 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv, ...@@ -757,8 +721,8 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
spin_lock_irqsave(&priv->rtllib->lock, flags); spin_lock_irqsave(&priv->rtllib->lock, flags);
if (network->flags & NETWORK_HAS_QOS_PARAMETERS) { if (network->flags & NETWORK_HAS_QOS_PARAMETERS) {
memcpy(&priv->rtllib->current_network.qos_data.parameters,\ memcpy(&priv->rtllib->current_network.qos_data.parameters,
&network->qos_data.parameters,\ &network->qos_data.parameters,
sizeof(struct rtllib_qos_parameters)); sizeof(struct rtllib_qos_parameters));
priv->rtllib->current_network.qos_data.active = 1; priv->rtllib->current_network.qos_data.active = 1;
priv->rtllib->wmm_acm = network->qos_data.wmm_acm; priv->rtllib->wmm_acm = network->qos_data.wmm_acm;
...@@ -778,7 +742,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv, ...@@ -778,7 +742,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
spin_unlock_irqrestore(&priv->rtllib->lock, flags); spin_unlock_irqrestore(&priv->rtllib->lock, flags);
RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n", __func__, RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n", __func__,
network->flags ,priv->rtllib->current_network.qos_data.active); network->flags, priv->rtllib->current_network.qos_data.active);
if (set_qos_param == 1) { if (set_qos_param == 1) {
dm_init_edca_turbo(priv->rtllib->dev); dm_init_edca_turbo(priv->rtllib->dev);
queue_work_rsl(priv->priv_wq, &priv->qos_activate); queue_work_rsl(priv->priv_wq, &priv->qos_activate);
...@@ -832,12 +796,12 @@ void rtl8192_stop_beacon(struct net_device *dev) ...@@ -832,12 +796,12 @@ void rtl8192_stop_beacon(struct net_device *dev)
{ {
} }
void rtl8192_config_rate(struct net_device* dev, u16* rate_config) void rtl8192_config_rate(struct net_device *dev, u16 *rate_config)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_network *net; struct rtllib_network *net;
u8 i=0, basic_rate = 0; u8 i = 0, basic_rate = 0;
net = & priv->rtllib->current_network; net = &priv->rtllib->current_network;
for (i = 0; i < net->rates_len; i++) { for (i = 0; i < net->rates_len; i++) {
basic_rate = net->rates[i] & 0x7f; basic_rate = net->rates[i] & 0x7f;
...@@ -924,12 +888,15 @@ void rtl8192_config_rate(struct net_device* dev, u16* rate_config) ...@@ -924,12 +888,15 @@ void rtl8192_config_rate(struct net_device* dev, u16* rate_config)
} }
} }
void rtl8192_refresh_supportrate(struct r8192_priv * priv) void rtl8192_refresh_supportrate(struct r8192_priv *priv)
{ {
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
if (ieee->mode == WIRELESS_MODE_N_24G || ieee->mode == WIRELESS_MODE_N_5G) { if (ieee->mode == WIRELESS_MODE_N_24G ||
memcpy(ieee->Regdot11HTOperationalRateSet, ieee->RegHTSuppRateSet, 16); ieee->mode == WIRELESS_MODE_N_5G) {
memcpy(ieee->Regdot11TxHTOperationalRateSet, ieee->RegHTSuppRateSet, 16); memcpy(ieee->Regdot11HTOperationalRateSet,
ieee->RegHTSuppRateSet, 16);
memcpy(ieee->Regdot11TxHTOperationalRateSet,
ieee->RegHTSuppRateSet, 16);
} else { } else {
memset(ieee->Regdot11HTOperationalRateSet, 0, 16); memset(ieee->Regdot11HTOperationalRateSet, 0, 16);
...@@ -937,7 +904,7 @@ void rtl8192_refresh_supportrate(struct r8192_priv * priv) ...@@ -937,7 +904,7 @@ void rtl8192_refresh_supportrate(struct r8192_priv * priv)
return; return;
} }
u8 rtl8192_getSupportedWireleeMode(struct net_device*dev) u8 rtl8192_getSupportedWireleeMode(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 ret = 0; u8 ret = 0;
...@@ -959,12 +926,13 @@ u8 rtl8192_getSupportedWireleeMode(struct net_device*dev) ...@@ -959,12 +926,13 @@ u8 rtl8192_getSupportedWireleeMode(struct net_device*dev)
return ret; return ret;
} }
void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode) void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 bSupportMode = rtl8192_getSupportedWireleeMode(dev); u8 bSupportMode = rtl8192_getSupportedWireleeMode(dev);
if ((wireless_mode == WIRELESS_MODE_AUTO) || ((wireless_mode & bSupportMode) == 0)) { if ((wireless_mode == WIRELESS_MODE_AUTO) ||
((wireless_mode & bSupportMode) == 0)) {
if (bSupportMode & WIRELESS_MODE_N_24G) { if (bSupportMode & WIRELESS_MODE_N_24G) {
wireless_mode = WIRELESS_MODE_N_24G; wireless_mode = WIRELESS_MODE_N_24G;
} else if (bSupportMode & WIRELESS_MODE_N_5G) { } else if (bSupportMode & WIRELESS_MODE_N_5G) {
...@@ -976,49 +944,55 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode) ...@@ -976,49 +944,55 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode)
} else if ((bSupportMode & WIRELESS_MODE_B)) { } else if ((bSupportMode & WIRELESS_MODE_B)) {
wireless_mode = WIRELESS_MODE_B; wireless_mode = WIRELESS_MODE_B;
} else { } else {
RT_TRACE(COMP_ERR, "%s(), No valid wireless mode supported (%x)!!!\n", RT_TRACE(COMP_ERR, "%s(), No valid wireless mode "
__func__, bSupportMode); "supported (%x)!!!\n", __func__, bSupportMode);
wireless_mode = WIRELESS_MODE_B; wireless_mode = WIRELESS_MODE_B;
} }
} }
if ((wireless_mode & (WIRELESS_MODE_B | WIRELESS_MODE_G)) == (WIRELESS_MODE_G | WIRELESS_MODE_B)) if ((wireless_mode & (WIRELESS_MODE_B | WIRELESS_MODE_G)) ==
(WIRELESS_MODE_G | WIRELESS_MODE_B))
wireless_mode = WIRELESS_MODE_G; wireless_mode = WIRELESS_MODE_G;
priv->rtllib->mode = wireless_mode; priv->rtllib->mode = wireless_mode;
ActUpdateChannelAccessSetting( dev, wireless_mode, &priv->ChannelAccessSetting); ActUpdateChannelAccessSetting(dev, wireless_mode,
&priv->ChannelAccessSetting);
if ((wireless_mode == WIRELESS_MODE_N_24G) || (wireless_mode == WIRELESS_MODE_N_5G)){ if ((wireless_mode == WIRELESS_MODE_N_24G) ||
(wireless_mode == WIRELESS_MODE_N_5G)) {
priv->rtllib->pHTInfo->bEnableHT = 1; priv->rtllib->pHTInfo->bEnableHT = 1;
RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT = 1\n", __func__,wireless_mode); RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT = 1\n",
}else{ __func__, wireless_mode);
} else {
priv->rtllib->pHTInfo->bEnableHT = 0; priv->rtllib->pHTInfo->bEnableHT = 0;
RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT = 0\n", __func__,wireless_mode); RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT = 0\n",
__func__, wireless_mode);
} }
RT_TRACE(COMP_INIT, "Current Wireless Mode is %x\n", wireless_mode); RT_TRACE(COMP_INIT, "Current Wireless Mode is %x\n", wireless_mode);
rtl8192_refresh_supportrate(priv); rtl8192_refresh_supportrate(priv);
} }
int _rtl8192_sta_up(struct net_device *dev,bool is_silent_reset) int _rtl8192_sta_up(struct net_device *dev, bool is_silent_reset)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)(&(priv->rtllib->PowerSaveControl)); struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
(&(priv->rtllib->PowerSaveControl));
bool init_status = true; bool init_status = true;
priv->bDriverIsGoingToUnload = false; priv->bDriverIsGoingToUnload = false;
priv->bdisable_nic = false; priv->bdisable_nic = false;
priv->up=1; priv->up = 1;
priv->rtllib->ieee_up=1; priv->rtllib->ieee_up = 1;
priv->up_first_time = 0; priv->up_first_time = 0;
RT_TRACE(COMP_INIT, "Bringing up iface"); RT_TRACE(COMP_INIT, "Bringing up iface");
priv->bfirst_init = true; priv->bfirst_init = true;
init_status = priv->ops->initialize_adapter(dev); init_status = priv->ops->initialize_adapter(dev);
if (init_status != true) if (init_status != true) {
{ RT_TRACE(COMP_ERR, "ERR!!! %s(): initialization is failed!\n",
RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization is failed!\n",__func__); __func__);
priv->bfirst_init = false; priv->bfirst_init = false;
return -1; return -1;
} }
...@@ -1027,16 +1001,14 @@ int _rtl8192_sta_up(struct net_device *dev,bool is_silent_reset) ...@@ -1027,16 +1001,14 @@ int _rtl8192_sta_up(struct net_device *dev,bool is_silent_reset)
RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);
priv->bfirst_init = false; priv->bfirst_init = false;
if (priv->polling_timer_on == 0){ if (priv->polling_timer_on == 0)
check_rfctrl_gpio_timer((unsigned long)dev); check_rfctrl_gpio_timer((unsigned long)dev);
}
if (priv->rtllib->state != RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
rtllib_softmac_start_protocol(priv->rtllib, 0); rtllib_softmac_start_protocol(priv->rtllib, 0);
rtllib_reset_queue(priv->rtllib); rtllib_reset_queue(priv->rtllib);
watch_dog_timer_callback((unsigned long) dev); watch_dog_timer_callback((unsigned long) dev);
if (!netif_queue_stopped(dev)) if (!netif_queue_stopped(dev))
netif_start_queue(dev); netif_start_queue(dev);
else else
...@@ -1051,7 +1023,8 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1051,7 +1023,8 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
unsigned long flags = 0; unsigned long flags = 0;
u8 RFInProgressTimeOut = 0; u8 RFInProgressTimeOut = 0;
if (priv->up == 0) return -1; if (priv->up == 0)
return -1;
if (priv->rtllib->rtllib_ips_leave != NULL) if (priv->rtllib->rtllib_ips_leave != NULL)
priv->rtllib->rtllib_ips_leave(dev); priv->rtllib->rtllib_ips_leave(dev);
...@@ -1060,7 +1033,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1060,7 +1033,7 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
LeisurePSLeave(dev); LeisurePSLeave(dev);
priv->bDriverIsGoingToUnload = true; priv->bDriverIsGoingToUnload = true;
priv->up=0; priv->up = 0;
priv->rtllib->ieee_up = 0; priv->rtllib->ieee_up = 0;
priv->bfirst_after_down = 1; priv->bfirst_after_down = 1;
RT_TRACE(COMP_DOWN, "==========>%s()\n", __func__); RT_TRACE(COMP_DOWN, "==========>%s()\n", __func__);
...@@ -1068,11 +1041,10 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1068,11 +1041,10 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
netif_stop_queue(dev); netif_stop_queue(dev);
priv->rtllib->wpa_ie_len = 0; priv->rtllib->wpa_ie_len = 0;
if (priv->rtllib->wpa_ie)
kfree(priv->rtllib->wpa_ie); kfree(priv->rtllib->wpa_ie);
priv->rtllib->wpa_ie = NULL; priv->rtllib->wpa_ie = NULL;
CamResetAllEntry(dev); CamResetAllEntry(dev);
memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
del_timer_sync(&priv->watch_dog_timer); del_timer_sync(&priv->watch_dog_timer);
...@@ -1080,34 +1052,34 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) ...@@ -1080,34 +1052,34 @@ int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
cancel_delayed_work(&priv->rtllib->hw_wakeup_wq); cancel_delayed_work(&priv->rtllib->hw_wakeup_wq);
rtllib_softmac_stop_protocol(priv->rtllib, 0, true); rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
spin_lock_irqsave(&priv->rf_ps_lock,flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
while(priv->RFChangeInProgress) while (priv->RFChangeInProgress) {
{ spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
spin_unlock_irqrestore(&priv->rf_ps_lock,flags); if (RFInProgressTimeOut > 100) {
if (RFInProgressTimeOut > 100) spin_lock_irqsave(&priv->rf_ps_lock, flags);
{
spin_lock_irqsave(&priv->rf_ps_lock,flags);
break; break;
} }
RT_TRACE(COMP_DBG, "===>%s():RF is in progress, need to wait until rf chang is done.\n",__func__); RT_TRACE(COMP_DBG, "===>%s():RF is in progress, need to wait "
"until rf chang is done.\n", __func__);
mdelay(1); mdelay(1);
RFInProgressTimeOut ++; RFInProgressTimeOut++;
spin_lock_irqsave(&priv->rf_ps_lock,flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
} }
priv->RFChangeInProgress = true; priv->RFChangeInProgress = true;
spin_unlock_irqrestore(&priv->rf_ps_lock,flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
priv->ops->stop_adapter(dev, false); priv->ops->stop_adapter(dev, false);
spin_lock_irqsave(&priv->rf_ps_lock,flags); spin_lock_irqsave(&priv->rf_ps_lock, flags);
priv->RFChangeInProgress = false; priv->RFChangeInProgress = false;
spin_unlock_irqrestore(&priv->rf_ps_lock,flags); spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
udelay(100); udelay(100);
memset(&priv->rtllib->current_network, 0 , offsetof(struct rtllib_network, list)); memset(&priv->rtllib->current_network, 0,
offsetof(struct rtllib_network, list));
RT_TRACE(COMP_DOWN, "<==========%s()\n", __func__); RT_TRACE(COMP_DOWN, "<==========%s()\n", __func__);
return 0; return 0;
} }
static void rtl8192_init_priv_handler(struct net_device* dev) static void rtl8192_init_priv_handler(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1134,7 +1106,8 @@ static void rtl8192_init_priv_handler(struct net_device* dev) ...@@ -1134,7 +1106,8 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
priv->rtllib->ps_is_queue_empty = rtl8192_is_tx_queue_empty; priv->rtllib->ps_is_queue_empty = rtl8192_is_tx_queue_empty;
priv->rtllib->GetNmodeSupportBySecCfg = rtl8192_GetNmodeSupportBySecCfg; priv->rtllib->GetNmodeSupportBySecCfg = rtl8192_GetNmodeSupportBySecCfg;
priv->rtllib->GetHalfNmodeSupportByAPsHandler = rtl8192_GetHalfNmodeSupportByAPs; priv->rtllib->GetHalfNmodeSupportByAPsHandler =
rtl8192_GetHalfNmodeSupportByAPs;
priv->rtllib->SetHwRegHandler = rtl8192e_SetHwReg; priv->rtllib->SetHwRegHandler = rtl8192e_SetHwReg;
priv->rtllib->AllowAllDestAddrHandler = rtl8192_AllowAllDestAddr; priv->rtllib->AllowAllDestAddrHandler = rtl8192_AllowAllDestAddr;
...@@ -1151,10 +1124,11 @@ static void rtl8192_init_priv_handler(struct net_device* dev) ...@@ -1151,10 +1124,11 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
priv->rtllib->rtllib_rfkill_poll = NULL; priv->rtllib->rtllib_rfkill_poll = NULL;
} }
static void rtl8192_init_priv_constant(struct net_device* dev) static void rtl8192_init_priv_constant(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)(&(priv->rtllib->PowerSaveControl)); struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
&(priv->rtllib->PowerSaveControl);
pPSC->RegMaxLPSAwakeIntvl = 5; pPSC->RegMaxLPSAwakeIntvl = 5;
...@@ -1170,7 +1144,7 @@ static void rtl8192_init_priv_constant(struct net_device* dev) ...@@ -1170,7 +1144,7 @@ static void rtl8192_init_priv_constant(struct net_device* dev)
} }
static void rtl8192_init_priv_variable(struct net_device* dev) static void rtl8192_init_priv_variable(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 i; u8 i;
...@@ -1194,7 +1168,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1194,7 +1168,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->txringcount = 64; priv->txringcount = 64;
priv->rxbuffersize = 9100; priv->rxbuffersize = 9100;
priv->rxringcount = MAX_RX_COUNT; priv->rxringcount = MAX_RX_COUNT;
priv->irq_enabled=0; priv->irq_enabled = 0;
priv->chan = 1; priv->chan = 1;
priv->RegWirelessMode = WIRELESS_MODE_AUTO; priv->RegWirelessMode = WIRELESS_MODE_AUTO;
priv->RegChannelPlan = 0xf; priv->RegChannelPlan = 0xf;
...@@ -1206,14 +1180,15 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1206,14 +1180,15 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->rtllib->iw_mode = IW_MODE_INFRA; priv->rtllib->iw_mode = IW_MODE_INFRA;
priv->rtllib->bNetPromiscuousMode = false; priv->rtllib->bNetPromiscuousMode = false;
priv->rtllib->IntelPromiscuousModeInfo.bPromiscuousOn = false; priv->rtllib->IntelPromiscuousModeInfo.bPromiscuousOn = false;
priv->rtllib->IntelPromiscuousModeInfo.bFilterSourceStationFrame = false; priv->rtllib->IntelPromiscuousModeInfo.bFilterSourceStationFrame =
priv->rtllib->ieee_up=0; false;
priv->rtllib->ieee_up = 0;
priv->retry_rts = DEFAULT_RETRY_RTS; priv->retry_rts = DEFAULT_RETRY_RTS;
priv->retry_data = DEFAULT_RETRY_DATA; priv->retry_data = DEFAULT_RETRY_DATA;
priv->rtllib->rts = DEFAULT_RTS_THRESHOLD; priv->rtllib->rts = DEFAULT_RTS_THRESHOLD;
priv->rtllib->rate = 110; priv->rtllib->rate = 110;
priv->rtllib->short_slot = 1; priv->rtllib->short_slot = 1;
priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0; priv->promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
priv->bcck_in_ch14 = false; priv->bcck_in_ch14 = false;
priv->bfsync_processing = false; priv->bfsync_processing = false;
priv->CCKPresentAttentuation = 0; priv->CCKPresentAttentuation = 0;
...@@ -1225,9 +1200,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1225,9 +1200,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->bForcedSilentReset = 0; priv->bForcedSilentReset = 0;
priv->bDisableNormalResetCheck = false; priv->bDisableNormalResetCheck = false;
priv->force_reset = false; priv->force_reset = false;
memset(priv->rtllib->swcamtable,0,sizeof(struct sw_cam_table)*32); memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
memset(&priv->InterruptLog,0,sizeof(struct log_int_8190)); memset(&priv->InterruptLog, 0, sizeof(struct log_int_8190));
priv->RxCounter = 0; priv->RxCounter = 0;
priv->rtllib->wx_set_enc = 0; priv->rtllib->wx_set_enc = 0;
priv->bHwRadioOff = false; priv->bHwRadioOff = false;
...@@ -1247,7 +1222,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1247,7 +1222,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->rtllib->eRFPowerState = eRfOn; priv->rtllib->eRFPowerState = eRfOn;
priv->txpower_checkcnt = 0; priv->txpower_checkcnt = 0;
priv->thermal_readback_index =0; priv->thermal_readback_index = 0;
priv->txpower_tracking_callback_cnt = 0; priv->txpower_tracking_callback_cnt = 0;
priv->ccktxpower_adjustcnt_ch14 = 0; priv->ccktxpower_adjustcnt_ch14 = 0;
priv->ccktxpower_adjustcnt_not_ch14 = 0; priv->ccktxpower_adjustcnt_not_ch14 = 0;
...@@ -1256,7 +1231,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1256,7 +1231,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->rtllib->iw_mode = IW_MODE_INFRA; priv->rtllib->iw_mode = IW_MODE_INFRA;
priv->rtllib->active_scan = 1; priv->rtllib->active_scan = 1;
priv->rtllib->be_scan_inprogress = false; priv->rtllib->be_scan_inprogress = false;
priv->rtllib->modulation = RTLLIB_CCK_MODULATION | RTLLIB_OFDM_MODULATION; priv->rtllib->modulation = RTLLIB_CCK_MODULATION |
RTLLIB_OFDM_MODULATION;
priv->rtllib->host_encrypt = 1; priv->rtllib->host_encrypt = 1;
priv->rtllib->host_decrypt = 1; priv->rtllib->host_decrypt = 1;
...@@ -1268,23 +1244,20 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -1268,23 +1244,20 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->card_type = PCI; priv->card_type = PCI;
priv->AcmControl = 0; priv->AcmControl = 0;
priv->pFirmware = (struct rt_firmware *)vmalloc(sizeof(struct rt_firmware)); priv->pFirmware = vmalloc(sizeof(struct rt_firmware));
if (priv->pFirmware) if (priv->pFirmware)
memset(priv->pFirmware, 0, sizeof(struct rt_firmware)); memset(priv->pFirmware, 0, sizeof(struct rt_firmware));
skb_queue_head_init(&priv->rx_queue); skb_queue_head_init(&priv->rx_queue);
skb_queue_head_init(&priv->skb_queue); skb_queue_head_init(&priv->skb_queue);
for (i = 0; i < MAX_QUEUE_SIZE; i++) { for (i = 0; i < MAX_QUEUE_SIZE; i++)
skb_queue_head_init(&priv->rtllib->skb_waitQ [i]); skb_queue_head_init(&priv->rtllib->skb_waitQ[i]);
} for (i = 0; i < MAX_QUEUE_SIZE; i++)
for (i = 0; i < MAX_QUEUE_SIZE; i++) { skb_queue_head_init(&priv->rtllib->skb_aggQ[i]);
skb_queue_head_init(&priv->rtllib->skb_aggQ [i]);
}
} }
static void rtl8192_init_priv_lock(struct r8192_priv * priv) static void rtl8192_init_priv_lock(struct r8192_priv *priv)
{ {
spin_lock_init(&priv->fw_scan_lock); spin_lock_init(&priv->fw_scan_lock);
spin_lock_init(&priv->tx_lock); spin_lock_init(&priv->tx_lock);
...@@ -1294,25 +1267,31 @@ static void rtl8192_init_priv_lock(struct r8192_priv * priv) ...@@ -1294,25 +1267,31 @@ static void rtl8192_init_priv_lock(struct r8192_priv * priv)
spin_lock_init(&priv->ps_lock); spin_lock_init(&priv->ps_lock);
spin_lock_init(&priv->rf_lock); spin_lock_init(&priv->rf_lock);
spin_lock_init(&priv->rt_h2c_lock); spin_lock_init(&priv->rt_h2c_lock);
sema_init(&priv->wx_sem,1); sema_init(&priv->wx_sem, 1);
sema_init(&priv->rf_sem,1); sema_init(&priv->rf_sem, 1);
mutex_init(&priv->mutex); mutex_init(&priv->mutex);
} }
static void rtl8192_init_priv_task(struct net_device* dev) static void rtl8192_init_priv_task(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
priv->priv_wq = create_workqueue(DRV_NAME); priv->priv_wq = create_workqueue(DRV_NAME);
INIT_WORK_RSL(&priv->reset_wq, (void*)rtl8192_restart, dev); INIT_WORK_RSL(&priv->reset_wq, (void *)rtl8192_restart, dev);
INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void*)IPSLeave_wq, dev); INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)IPSLeave_wq, dev);
INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq, (void*)rtl819x_watchdog_wqcallback, dev); INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq,
INIT_DELAYED_WORK_RSL(&priv->txpower_tracking_wq, (void*)dm_txpower_trackingcallback, dev); (void *)rtl819x_watchdog_wqcallback, dev);
INIT_DELAYED_WORK_RSL(&priv->rfpath_check_wq, (void*)dm_rf_pathcheck_workitemcallback, dev); INIT_DELAYED_WORK_RSL(&priv->txpower_tracking_wq,
INIT_DELAYED_WORK_RSL(&priv->update_beacon_wq, (void*)rtl8192_update_beacon, dev); (void *)dm_txpower_trackingcallback, dev);
INIT_WORK_RSL(&priv->qos_activate, (void*)rtl8192_qos_activate, dev); INIT_DELAYED_WORK_RSL(&priv->rfpath_check_wq,
INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_wakeup_wq,(void*) rtl8192_hw_wakeup_wq, dev); (void *)dm_rf_pathcheck_workitemcallback, dev);
INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_sleep_wq,(void*) rtl8192_hw_sleep_wq, dev); INIT_DELAYED_WORK_RSL(&priv->update_beacon_wq,
(void *)rtl8192_update_beacon, dev);
INIT_WORK_RSL(&priv->qos_activate, (void *)rtl8192_qos_activate, dev);
INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_wakeup_wq,
(void *) rtl8192_hw_wakeup_wq, dev);
INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_sleep_wq,
(void *) rtl8192_hw_sleep_wq, dev);
tasklet_init(&priv->irq_rx_tasklet, tasklet_init(&priv->irq_rx_tasklet,
(void(*)(unsigned long))rtl8192_irq_rx_tasklet, (void(*)(unsigned long))rtl8192_irq_rx_tasklet,
(unsigned long)priv); (unsigned long)priv);
...@@ -1324,27 +1303,28 @@ static void rtl8192_init_priv_task(struct net_device* dev) ...@@ -1324,27 +1303,28 @@ static void rtl8192_init_priv_task(struct net_device* dev)
(unsigned long)priv); (unsigned long)priv);
} }
short rtl8192_get_channel_map(struct net_device * dev) short rtl8192_get_channel_map(struct net_device *dev)
{ {
int i; int i;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256) if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256)
&& (priv->rf_chip != RF_6052)) { && (priv->rf_chip != RF_6052)) {
RT_TRACE(COMP_ERR, "%s: unknown rf chip, can't set channel map\n", __func__); RT_TRACE(COMP_ERR, "%s: unknown rf chip, can't set channel "
"map\n", __func__);
return -1; return -1;
} }
if (priv->ChannelPlan > COUNTRY_CODE_MAX) { if (priv->ChannelPlan > COUNTRY_CODE_MAX) {
printk("rtl819x_init:Error channel plan! Set to default.\n"); printk(KERN_INFO "rtl819x_init:Error channel plan! Set to "
priv->ChannelPlan= COUNTRY_CODE_FCC; "default.\n");
priv->ChannelPlan = COUNTRY_CODE_FCC;
} }
RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan); RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
Dot11d_Init(priv->rtllib); Dot11d_Init(priv->rtllib);
Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib); Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
for (i = 1; i <= 11; i++) { for (i = 1; i <= 11; i++)
(priv->rtllib->active_channel_map)[i] = 1; (priv->rtllib->active_channel_map)[i] = 1;
}
(priv->rtllib->active_channel_map)[12] = 2; (priv->rtllib->active_channel_map)[12] = 2;
(priv->rtllib->active_channel_map)[13] = 2; (priv->rtllib->active_channel_map)[13] = 2;
...@@ -1355,10 +1335,9 @@ short rtl8192_init(struct net_device *dev) ...@@ -1355,10 +1335,9 @@ short rtl8192_init(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
memset(&(priv->stats),0,sizeof(struct rt_stats)); memset(&(priv->stats), 0, sizeof(struct rt_stats));
rtl8192_dbgp_flag_init(dev); rtl8192_dbgp_flag_init(dev);
rtl8192_init_priv_handler(dev); rtl8192_init_priv_handler(dev);
rtl8192_init_priv_constant(dev); rtl8192_init_priv_constant(dev);
rtl8192_init_priv_variable(dev); rtl8192_init_priv_variable(dev);
...@@ -1381,17 +1360,17 @@ short rtl8192_init(struct net_device *dev) ...@@ -1381,17 +1360,17 @@ short rtl8192_init(struct net_device *dev)
(unsigned long)dev); (unsigned long)dev);
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
if (request_irq(dev->irq, (void*)rtl8192_interrupt_rsl, IRQF_SHARED, dev->name, dev)) if (request_irq(dev->irq, (void *)rtl8192_interrupt_rsl, IRQF_SHARED,
{ dev->name, dev)) {
printk("Error allocating IRQ %d",dev->irq); printk(KERN_ERR "Error allocating IRQ %d", dev->irq);
return -1; return -1;
} else { } else {
priv->irq=dev->irq; priv->irq = dev->irq;
RT_TRACE(COMP_INIT, "IRQ %d\n",dev->irq); RT_TRACE(COMP_INIT, "IRQ %d\n", dev->irq);
} }
if (rtl8192_pci_initdescring(dev) != 0) { if (rtl8192_pci_initdescring(dev) != 0) {
printk("Endopoints initialization failed"); printk(KERN_ERR "Endopoints initialization failed");
return -1; return -1;
} }
...@@ -1403,34 +1382,32 @@ short rtl8192_init(struct net_device *dev) ...@@ -1403,34 +1382,32 @@ short rtl8192_init(struct net_device *dev)
***************************************************************************/ ***************************************************************************/
short rtl8192_is_tx_queue_empty(struct net_device *dev) short rtl8192_is_tx_queue_empty(struct net_device *dev)
{ {
int i=0; int i = 0;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
for (i=0; i<=MGNT_QUEUE; i++) for (i = 0; i <= MGNT_QUEUE; i++) {
{ if ((i == TXCMD_QUEUE) || (i == HCCA_QUEUE))
if ((i== TXCMD_QUEUE) || (i == HCCA_QUEUE) )
continue; continue;
if (skb_queue_len(&(&priv->tx_ring[i])->queue) > 0){ if (skb_queue_len(&(&priv->tx_ring[i])->queue) > 0) {
printk("===>tx queue is not empty:%d, %d\n", i, skb_queue_len(&(&priv->tx_ring[i])->queue)); printk(KERN_INFO "===>tx queue is not empty:%d, %d\n",
i, skb_queue_len(&(&priv->tx_ring[i])->queue));
return 0; return 0;
} }
} }
return 1; return 1;
} }
enum reset_type enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
rtl819x_TxCheckStuck(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 QueueID; u8 QueueID;
u8 ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE; u8 ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
bool bCheckFwTxCnt = false; bool bCheckFwTxCnt = false;
struct rtl8192_tx_ring *ring = NULL; struct rtl8192_tx_ring *ring = NULL;
struct sk_buff* skb = NULL; struct sk_buff *skb = NULL;
struct cb_desc * tcb_desc = NULL; struct cb_desc *tcb_desc = NULL;
unsigned long flags = 0; unsigned long flags = 0;
switch (priv->rtllib->ps) switch (priv->rtllib->ps) {
{
case RTLLIB_PS_DISABLED: case RTLLIB_PS_DISABLED:
ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL; ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL;
break; break;
...@@ -1441,9 +1418,8 @@ rtl819x_TxCheckStuck(struct net_device *dev) ...@@ -1441,9 +1418,8 @@ rtl819x_TxCheckStuck(struct net_device *dev)
ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE; ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
break; break;
} }
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
for (QueueID = 0; QueueID < MAX_TX_QUEUE; QueueID++) for (QueueID = 0; QueueID < MAX_TX_QUEUE; QueueID++) {
{
if (QueueID == TXCMD_QUEUE) if (QueueID == TXCMD_QUEUE)
continue; continue;
...@@ -1452,24 +1428,26 @@ rtl819x_TxCheckStuck(struct net_device *dev) ...@@ -1452,24 +1428,26 @@ rtl819x_TxCheckStuck(struct net_device *dev)
ring = &priv->tx_ring[QueueID]; ring = &priv->tx_ring[QueueID];
if (skb_queue_len(&ring->queue) == 0) if (skb_queue_len(&ring->queue) == 0) {
continue; continue;
else } else {
{
skb = (&ring->queue)->next; skb = (&ring->queue)->next;
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc = (struct cb_desc *)(skb->cb +
MAX_DEV_ADDR_SIZE);
tcb_desc->nStuckCount++; tcb_desc->nStuckCount++;
bCheckFwTxCnt = true; bCheckFwTxCnt = true;
if (tcb_desc->nStuckCount > 1) if (tcb_desc->nStuckCount > 1)
printk("%s: QueueID=%d tcb_desc->nStuckCount=%d\n",__func__,QueueID,tcb_desc->nStuckCount); printk(KERN_INFO "%s: QueueID=%d tcb_desc->n"
"StuckCount=%d\n", __func__, QueueID,
tcb_desc->nStuckCount);
} }
} }
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
if (bCheckFwTxCnt) { if (bCheckFwTxCnt) {
if (priv->ops->TxCheckStuckHandler(dev)) if (priv->ops->TxCheckStuckHandler(dev)) {
{ RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no"
RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no Tx condition! \n"); " Tx condition!\n");
return RESET_TYPE_SILENT; return RESET_TYPE_SILENT;
} }
} }
...@@ -1481,8 +1459,7 @@ enum reset_type rtl819x_RxCheckStuck(struct net_device *dev) ...@@ -1481,8 +1459,7 @@ enum reset_type rtl819x_RxCheckStuck(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->ops->RxCheckStuckHandler(dev)) if (priv->ops->RxCheckStuckHandler(dev)) {
{
RT_TRACE(COMP_RESET, "RxStuck Condition\n"); RT_TRACE(COMP_RESET, "RxStuck Condition\n");
return RESET_TYPE_SILENT; return RESET_TYPE_SILENT;
} }
...@@ -1503,18 +1480,20 @@ rtl819x_ifcheck_resetornot(struct net_device *dev) ...@@ -1503,18 +1480,20 @@ rtl819x_ifcheck_resetornot(struct net_device *dev)
if (rfState == eRfOn) if (rfState == eRfOn)
TxResetType = rtl819x_TxCheckStuck(dev); TxResetType = rtl819x_TxCheckStuck(dev);
if ( rfState == eRfOn && if (rfState == eRfOn &&
(priv->rtllib->iw_mode == IW_MODE_INFRA) && (priv->rtllib->iw_mode == IW_MODE_INFRA) &&
(priv->rtllib->state == RTLLIB_LINKED)) { (priv->rtllib->state == RTLLIB_LINKED))
RxResetType = rtl819x_RxCheckStuck(dev); RxResetType = rtl819x_RxCheckStuck(dev);
}
if (TxResetType==RESET_TYPE_NORMAL || RxResetType==RESET_TYPE_NORMAL){ if (TxResetType == RESET_TYPE_NORMAL ||
printk("%s(): TxResetType is %d, RxResetType is %d\n",__func__,TxResetType,RxResetType); RxResetType == RESET_TYPE_NORMAL) {
printk(KERN_INFO "%s(): TxResetType is %d, RxResetType is %d\n",
__func__, TxResetType, RxResetType);
return RESET_TYPE_NORMAL; return RESET_TYPE_NORMAL;
} else if (TxResetType==RESET_TYPE_SILENT || RxResetType==RESET_TYPE_SILENT){ } else if (TxResetType == RESET_TYPE_SILENT ||
printk("%s(): TxResetType is %d, RxResetType is %d\n",__func__,TxResetType,RxResetType); RxResetType == RESET_TYPE_SILENT) {
printk(KERN_INFO "%s(): TxResetType is %d, RxResetType is %d\n",
__func__, TxResetType, RxResetType);
return RESET_TYPE_SILENT; return RESET_TYPE_SILENT;
} else { } else {
return RESET_TYPE_NORESET; return RESET_TYPE_NORESET;
...@@ -1537,21 +1516,20 @@ void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1537,21 +1516,20 @@ void rtl819x_ifsilentreset(struct net_device *dev)
u8 IsPortal = 0; u8 IsPortal = 0;
if (priv->ResetProgress==RESET_TYPE_NORESET) { if (priv->ResetProgress == RESET_TYPE_NORESET) {
RT_TRACE(COMP_RESET,"=========>Reset progress!! \n"); RT_TRACE(COMP_RESET, "=========>Reset progress!!\n");
priv->ResetProgress = RESET_TYPE_SILENT; priv->ResetProgress = RESET_TYPE_SILENT;
spin_lock_irqsave(&priv->rf_ps_lock,flag); spin_lock_irqsave(&priv->rf_ps_lock, flag);
if (priv->RFChangeInProgress) if (priv->RFChangeInProgress) {
{ spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
spin_unlock_irqrestore(&priv->rf_ps_lock,flag);
goto END; goto END;
} }
priv->RFChangeInProgress = true; priv->RFChangeInProgress = true;
priv->bResetInProgress = true; priv->bResetInProgress = true;
spin_unlock_irqrestore(&priv->rf_ps_lock,flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
RESET_START: RESET_START:
...@@ -1561,15 +1539,18 @@ void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1561,15 +1539,18 @@ void rtl819x_ifsilentreset(struct net_device *dev)
LeisurePSLeave(dev); LeisurePSLeave(dev);
if (IS_NIC_DOWN(priv)) { if (IS_NIC_DOWN(priv)) {
RT_TRACE(COMP_ERR,"%s():the driver is not up! return\n",__func__); RT_TRACE(COMP_ERR, "%s():the driver is not up! "
"return\n", __func__);
up(&priv->wx_sem); up(&priv->wx_sem);
return ; return ;
} }
priv->up = 0; priv->up = 0;
RT_TRACE(COMP_RESET,"%s():======>start to down the driver\n",__func__); RT_TRACE(COMP_RESET, "%s():======>start to down the driver\n",
__func__);
mdelay(1000); mdelay(1000);
RT_TRACE(COMP_RESET,"%s():111111111111111111111111======>start to down the driver\n",__func__); RT_TRACE(COMP_RESET, "%s():111111111111111111111111======>start"
" to down the driver\n", __func__);
if (!netif_queue_stopped(dev)) if (!netif_queue_stopped(dev))
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -1582,7 +1563,7 @@ void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1582,7 +1563,7 @@ void rtl819x_ifsilentreset(struct net_device *dev)
if (ieee->state == RTLLIB_LINKED) { if (ieee->state == RTLLIB_LINKED) {
SEM_DOWN_IEEE_WX(&ieee->wx_sem); SEM_DOWN_IEEE_WX(&ieee->wx_sem);
printk("ieee->state is RTLLIB_LINKED\n"); printk(KERN_INFO "ieee->state is RTLLIB_LINKED\n");
rtllib_stop_send_beacons(priv->rtllib); rtllib_stop_send_beacons(priv->rtllib);
del_timer_sync(&ieee->associate_timer); del_timer_sync(&ieee->associate_timer);
cancel_delayed_work(&ieee->associate_retry_wq); cancel_delayed_work(&ieee->associate_retry_wq);
...@@ -1590,43 +1571,51 @@ void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1590,43 +1571,51 @@ void rtl819x_ifsilentreset(struct net_device *dev)
netif_carrier_off(dev); netif_carrier_off(dev);
SEM_UP_IEEE_WX(&ieee->wx_sem); SEM_UP_IEEE_WX(&ieee->wx_sem);
} else { } else {
printk("ieee->state is NOT LINKED\n"); printk(KERN_INFO "ieee->state is NOT LINKED\n");
rtllib_softmac_stop_protocol(priv->rtllib, 0 ,true); rtllib_softmac_stop_protocol(priv->rtllib, 0 , true);
} }
dm_backup_dynamic_mechanism_state(dev); dm_backup_dynamic_mechanism_state(dev);
up(&priv->wx_sem); up(&priv->wx_sem);
RT_TRACE(COMP_RESET,"%s():<==========down process is finished\n",__func__); RT_TRACE(COMP_RESET, "%s():<==========down process is "
"finished\n", __func__);
RT_TRACE(COMP_RESET,"%s():<===========up process start\n",__func__); RT_TRACE(COMP_RESET, "%s():<===========up process start\n",
reset_status = _rtl8192_up(dev,true); __func__);
reset_status = _rtl8192_up(dev, true);
RT_TRACE(COMP_RESET,"%s():<===========up process is finished\n",__func__); RT_TRACE(COMP_RESET, "%s():<===========up process is "
"finished\n", __func__);
if (reset_status == -1) { if (reset_status == -1) {
if (reset_times < 3) { if (reset_times < 3) {
reset_times++; reset_times++;
goto RESET_START; goto RESET_START;
} else { } else {
RT_TRACE(COMP_ERR," ERR!!! %s(): Reset Failed!!\n",__func__); RT_TRACE(COMP_ERR, " ERR!!! %s(): Reset "
"Failed!!\n", __func__);
} }
} }
ieee->is_silent_reset = 1; ieee->is_silent_reset = 1;
spin_lock_irqsave(&priv->rf_ps_lock,flag); spin_lock_irqsave(&priv->rf_ps_lock, flag);
priv->RFChangeInProgress = false; priv->RFChangeInProgress = false;
spin_unlock_irqrestore(&priv->rf_ps_lock,flag); spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
EnableHWSecurityConfig8192(dev); EnableHWSecurityConfig8192(dev);
if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA) { if (ieee->state == RTLLIB_LINKED && ieee->iw_mode ==
ieee->set_chan(ieee->dev, ieee->current_network.channel); IW_MODE_INFRA) {
ieee->set_chan(ieee->dev,
ieee->current_network.channel);
queue_work_rsl(ieee->wq, &ieee->associate_complete_wq); queue_work_rsl(ieee->wq, &ieee->associate_complete_wq);
} else if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_ADHOC) { } else if (ieee->state == RTLLIB_LINKED && ieee->iw_mode ==
ieee->set_chan(ieee->dev, ieee->current_network.channel); IW_MODE_ADHOC) {
ieee->set_chan(ieee->dev,
ieee->current_network.channel);
ieee->link_change(ieee->dev); ieee->link_change(ieee->dev);
notify_wx_assoc_event(ieee); notify_wx_assoc_event(ieee);
...@@ -1646,16 +1635,16 @@ void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -1646,16 +1635,16 @@ void rtl819x_ifsilentreset(struct net_device *dev)
priv->ResetProgress = RESET_TYPE_NORESET; priv->ResetProgress = RESET_TYPE_NORESET;
priv->reset_count++; priv->reset_count++;
priv->bForcedSilentReset =false; priv->bForcedSilentReset = false;
priv->bResetInProgress = false; priv->bResetInProgress = false;
write_nic_byte(dev, UFWP, 1); write_nic_byte(dev, UFWP, 1);
RT_TRACE(COMP_RESET, "Reset finished!! ====>[%d]\n", priv->reset_count); RT_TRACE(COMP_RESET, "Reset finished!! ====>[%d]\n",
priv->reset_count);
} }
} }
void rtl819x_update_rxcounts(struct r8192_priv *priv, void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
u32 *TotalRxBcnNum,
u32 *TotalRxDataNum) u32 *TotalRxDataNum)
{ {
u16 SlotIndex; u16 SlotIndex;
...@@ -1664,9 +1653,12 @@ void rtl819x_update_rxcounts(struct r8192_priv *priv, ...@@ -1664,9 +1653,12 @@ void rtl819x_update_rxcounts(struct r8192_priv *priv,
*TotalRxBcnNum = 0; *TotalRxBcnNum = 0;
*TotalRxDataNum = 0; *TotalRxDataNum = 0;
SlotIndex = (priv->rtllib->LinkDetectInfo.SlotIndex++)%(priv->rtllib->LinkDetectInfo.SlotNum); SlotIndex = (priv->rtllib->LinkDetectInfo.SlotIndex++) %
priv->rtllib->LinkDetectInfo.RxBcnNum[SlotIndex] = priv->rtllib->LinkDetectInfo.NumRecvBcnInPeriod; (priv->rtllib->LinkDetectInfo.SlotNum);
priv->rtllib->LinkDetectInfo.RxDataNum[SlotIndex] = priv->rtllib->LinkDetectInfo.NumRecvDataInPeriod; priv->rtllib->LinkDetectInfo.RxBcnNum[SlotIndex] =
priv->rtllib->LinkDetectInfo.NumRecvBcnInPeriod;
priv->rtllib->LinkDetectInfo.RxDataNum[SlotIndex] =
priv->rtllib->LinkDetectInfo.NumRecvDataInPeriod;
for (i = 0; i < priv->rtllib->LinkDetectInfo.SlotNum; i++) { for (i = 0; i < priv->rtllib->LinkDetectInfo.SlotNum; i++) {
*TotalRxBcnNum += priv->rtllib->LinkDetectInfo.RxBcnNum[i]; *TotalRxBcnNum += priv->rtllib->LinkDetectInfo.RxBcnNum[i];
*TotalRxDataNum += priv->rtllib->LinkDetectInfo.RxDataNum[i]; *TotalRxDataNum += priv->rtllib->LinkDetectInfo.RxDataNum[i];
...@@ -1676,13 +1668,15 @@ void rtl819x_update_rxcounts(struct r8192_priv *priv, ...@@ -1676,13 +1668,15 @@ void rtl819x_update_rxcounts(struct r8192_priv *priv,
void rtl819x_watchdog_wqcallback(void *data) void rtl819x_watchdog_wqcallback(void *data)
{ {
struct r8192_priv *priv = container_of_dwork_rsl(data, struct r8192_priv, watch_dog_wq); struct r8192_priv *priv = container_of_dwork_rsl(data,
struct r8192_priv, watch_dog_wq);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
enum reset_type ResetType = RESET_TYPE_NORESET; enum reset_type ResetType = RESET_TYPE_NORESET;
static u8 check_reset_cnt = 0; static u8 check_reset_cnt;
unsigned long flags; unsigned long flags;
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)(&(priv->rtllib->PowerSaveControl)); struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
(&(priv->rtllib->PowerSaveControl));
bool bBusyTraffic = false; bool bBusyTraffic = false;
bool bHigherBusyTraffic = false; bool bHigherBusyTraffic = false;
bool bHigherBusyRxTraffic = false; bool bHigherBusyRxTraffic = false;
...@@ -1692,7 +1686,7 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1692,7 +1686,7 @@ void rtl819x_watchdog_wqcallback(void *data)
return; return;
if (priv->rtllib->state >= RTLLIB_LINKED) { if (priv->rtllib->state >= RTLLIB_LINKED) {
if (priv->rtllib->CntAfterLink<2) if (priv->rtllib->CntAfterLink < 2)
priv->rtllib->CntAfterLink++; priv->rtllib->CntAfterLink++;
} else { } else {
priv->rtllib->CntAfterLink = 0; priv->rtllib->CntAfterLink = 0;
...@@ -1700,31 +1694,29 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1700,31 +1694,29 @@ void rtl819x_watchdog_wqcallback(void *data)
hal_dm_watchdog(dev); hal_dm_watchdog(dev);
if (rtllib_act_scanning(priv->rtllib,false) == false){ if (rtllib_act_scanning(priv->rtllib, false) == false) {
if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == RTLLIB_NOLINK) &&\ if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state ==
(ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key &&\ RTLLIB_NOLINK) &&
(!ieee->proto_stoppping) && !ieee->wx_set_enc (ieee->eRFPowerState == eRfOn) && !ieee->is_set_key &&
){ (!ieee->proto_stoppping) && !ieee->wx_set_enc) {
if ((ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE)&& if ((ieee->PowerSaveControl.ReturnPoint ==
(!ieee->bNetPromiscuousMode)) IPS_CALLBACK_NONE) &&
{ (!ieee->bNetPromiscuousMode)) {
RT_TRACE(COMP_PS, "====================>haha:IPSEnter()\n"); RT_TRACE(COMP_PS, "====================>haha: "
"IPSEnter()\n");
IPSEnter(dev); IPSEnter(dev);
} }
} }
} }
{ if ((ieee->state == RTLLIB_LINKED) && (ieee->iw_mode ==
if ((ieee->state == RTLLIB_LINKED) && (ieee->iw_mode == IW_MODE_INFRA) && (!ieee->bNetPromiscuousMode)) IW_MODE_INFRA) && (!ieee->bNetPromiscuousMode)) {
{ if (ieee->LinkDetectInfo.NumRxOkInPeriod > 100 ||
if ( ieee->LinkDetectInfo.NumRxOkInPeriod> 100 || ieee->LinkDetectInfo.NumTxOkInPeriod > 100)
ieee->LinkDetectInfo.NumTxOkInPeriod> 100 ) {
bBusyTraffic = true; bBusyTraffic = true;
}
if ( ieee->LinkDetectInfo.NumRxOkInPeriod > 4000 || if (ieee->LinkDetectInfo.NumRxOkInPeriod > 4000 ||
ieee->LinkDetectInfo.NumTxOkInPeriod > 4000 ) ieee->LinkDetectInfo.NumTxOkInPeriod > 4000) {
{
bHigherBusyTraffic = true; bHigherBusyTraffic = true;
if (ieee->LinkDetectInfo.NumRxOkInPeriod > 5000) if (ieee->LinkDetectInfo.NumRxOkInPeriod > 5000)
bHigherBusyRxTraffic = true; bHigherBusyRxTraffic = true;
...@@ -1732,14 +1724,15 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1732,14 +1724,15 @@ void rtl819x_watchdog_wqcallback(void *data)
bHigherBusyRxTraffic = false; bHigherBusyRxTraffic = false;
} }
if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) || if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod +
ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) ||
(ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2))
bEnterPS= false; bEnterPS = false;
else else
bEnterPS= true; bEnterPS = true;
if (ieee->current_network.beacon_interval < 95) if (ieee->current_network.beacon_interval < 95)
bEnterPS= false; bEnterPS = false;
if (bEnterPS) if (bEnterPS)
LeisurePSEnter(dev); LeisurePSEnter(dev);
...@@ -1747,7 +1740,7 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1747,7 +1740,7 @@ void rtl819x_watchdog_wqcallback(void *data)
LeisurePSLeave(dev); LeisurePSLeave(dev);
} else { } else {
RT_TRACE(COMP_LPS,"====>no link LPS leave\n"); RT_TRACE(COMP_LPS, "====>no link LPS leave\n");
LeisurePSLeave(dev); LeisurePSLeave(dev);
} }
...@@ -1759,71 +1752,67 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1759,71 +1752,67 @@ void rtl819x_watchdog_wqcallback(void *data)
ieee->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic; ieee->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic;
ieee->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic; ieee->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic;
} if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA) {
{
if (ieee->state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA)
{
u32 TotalRxBcnNum = 0; u32 TotalRxBcnNum = 0;
u32 TotalRxDataNum = 0; u32 TotalRxDataNum = 0;
rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum); rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
if ((TotalRxBcnNum+TotalRxDataNum) == 0) if ((TotalRxBcnNum+TotalRxDataNum) == 0)
priv->check_roaming_cnt ++; priv->check_roaming_cnt++;
else else
priv->check_roaming_cnt = 0; priv->check_roaming_cnt = 0;
if (priv->check_roaming_cnt > 0) if (priv->check_roaming_cnt > 0) {
{ if (ieee->eRFPowerState == eRfOff)
if ( ieee->eRFPowerState == eRfOff) RT_TRACE(COMP_ERR, "========>%s()\n", __func__);
RT_TRACE(COMP_ERR,"========>%s()\n",__func__);
printk("===>%s(): AP is power off,chan:%d, connect another one\n",__func__, priv->chan); printk(KERN_INFO "===>%s(): AP is power off, chan:%d,"
" connect another one\n", __func__, priv->chan);
ieee->state = RTLLIB_ASSOCIATING; ieee->state = RTLLIB_ASSOCIATING;
RemovePeerTS(priv->rtllib,priv->rtllib->current_network.bssid); RemovePeerTS(priv->rtllib,
priv->rtllib->current_network.bssid);
ieee->is_roaming = true; ieee->is_roaming = true;
ieee->is_set_key = false; ieee->is_set_key = false;
ieee->link_change(dev); ieee->link_change(dev);
if (ieee->LedControlHandler) if (ieee->LedControlHandler)
ieee->LedControlHandler(ieee->dev, LED_CTL_START_TO_LINK); ieee->LedControlHandler(ieee->dev,
LED_CTL_START_TO_LINK);
notify_wx_assoc_event(ieee); notify_wx_assoc_event(ieee);
if (!(ieee->rtllib_ap_sec_type(ieee)&(SEC_ALG_CCMP|SEC_ALG_TKIP))) if (!(ieee->rtllib_ap_sec_type(ieee) &
queue_delayed_work_rsl(ieee->wq, &ieee->associate_procedure_wq, 0); (SEC_ALG_CCMP|SEC_ALG_TKIP)))
queue_delayed_work_rsl(ieee->wq,
&ieee->associate_procedure_wq, 0);
priv->check_roaming_cnt = 0; priv->check_roaming_cnt = 0;
} }
} ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;
ieee->LinkDetectInfo.NumRecvBcnInPeriod=0; ieee->LinkDetectInfo.NumRecvDataInPeriod = 0;
ieee->LinkDetectInfo.NumRecvDataInPeriod=0;
} }
spin_lock_irqsave(&priv->tx_lock,flags); spin_lock_irqsave(&priv->tx_lock, flags);
if ((check_reset_cnt++ >= 3) && (!ieee->is_roaming) && if ((check_reset_cnt++ >= 3) && (!ieee->is_roaming) &&
(!priv->RFChangeInProgress) && (!pPSC->bSwRfProcessing)) (!priv->RFChangeInProgress) && (!pPSC->bSwRfProcessing)) {
{
ResetType = rtl819x_ifcheck_resetornot(dev); ResetType = rtl819x_ifcheck_resetornot(dev);
check_reset_cnt = 3; check_reset_cnt = 3;
} }
spin_unlock_irqrestore(&priv->tx_lock,flags); spin_unlock_irqrestore(&priv->tx_lock, flags);
if (!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL) if (!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL) {
{
priv->ResetProgress = RESET_TYPE_NORMAL; priv->ResetProgress = RESET_TYPE_NORMAL;
RT_TRACE(COMP_RESET,"%s(): NOMAL RESET\n",__func__); RT_TRACE(COMP_RESET, "%s(): NOMAL RESET\n", __func__);
return; return;
} }
if ( ((priv->force_reset) || (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT))) if (((priv->force_reset) || (!priv->bDisableNormalResetCheck &&
{ ResetType == RESET_TYPE_SILENT)))
rtl819x_ifsilentreset(dev); rtl819x_ifsilentreset(dev);
}
priv->force_reset = false; priv->force_reset = false;
priv->bForcedSilentReset = false; priv->bForcedSilentReset = false;
priv->bResetInProgress = false; priv->bResetInProgress = false;
...@@ -1832,9 +1821,10 @@ void rtl819x_watchdog_wqcallback(void *data) ...@@ -1832,9 +1821,10 @@ void rtl819x_watchdog_wqcallback(void *data)
void watch_dog_timer_callback(unsigned long data) void watch_dog_timer_callback(unsigned long data)
{ {
struct r8192_priv *priv = rtllib_priv((struct net_device *) data); struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
queue_delayed_work_rsl(priv->priv_wq,&priv->watch_dog_wq,0); queue_delayed_work_rsl(priv->priv_wq, &priv->watch_dog_wq, 0);
mod_timer(&priv->watch_dog_timer, jiffies + MSECS(RTLLIB_WATCH_DOG_TIME)); mod_timer(&priv->watch_dog_timer, jiffies +
MSECS(RTLLIB_WATCH_DOG_TIME));
} }
/**************************************************************************** /****************************************************************************
...@@ -1859,9 +1849,10 @@ void rtl8192_tx_enable(struct net_device *dev) ...@@ -1859,9 +1849,10 @@ void rtl8192_tx_enable(struct net_device *dev)
static void rtl8192_free_rx_ring(struct net_device *dev) static void rtl8192_free_rx_ring(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
int i,rx_queue_idx; int i, rx_queue_idx;
for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){ for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE;
rx_queue_idx++) {
for (i = 0; i < priv->rxringcount; i++) { for (i = 0; i < priv->rxringcount; i++) {
struct sk_buff *skb = priv->rx_buf[rx_queue_idx][i]; struct sk_buff *skb = priv->rx_buf[rx_queue_idx][i];
if (!skb) if (!skb)
...@@ -1873,8 +1864,11 @@ static void rtl8192_free_rx_ring(struct net_device *dev) ...@@ -1873,8 +1864,11 @@ static void rtl8192_free_rx_ring(struct net_device *dev)
kfree_skb(skb); kfree_skb(skb);
} }
pci_free_consistent(priv->pdev, sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, pci_free_consistent(priv->pdev,
priv->rx_ring[rx_queue_idx], priv->rx_ring_dma[rx_queue_idx]); sizeof(*priv->rx_ring[rx_queue_idx]) *
priv->rxringcount,
priv->rx_ring[rx_queue_idx],
priv->rx_ring_dma[rx_queue_idx]);
priv->rx_ring[rx_queue_idx] = NULL; priv->rx_ring[rx_queue_idx] = NULL;
} }
} }
...@@ -1908,14 +1902,17 @@ void rtl8192_data_hard_resume(struct net_device *dev) ...@@ -1908,14 +1902,17 @@ void rtl8192_data_hard_resume(struct net_device *dev)
{ {
} }
void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate) void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
int rate)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
int ret; int ret;
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +
MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index; u8 queue_index = tcb_desc->queue_index;
if ((priv->rtllib->eRFPowerState == eRfOff) || IS_NIC_DOWN(priv) || priv->bResetInProgress){ if ((priv->rtllib->eRFPowerState == eRfOff) || IS_NIC_DOWN(priv) ||
priv->bResetInProgress) {
kfree_skb(skb); kfree_skb(skb);
return; return;
} }
...@@ -1923,15 +1920,16 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat ...@@ -1923,15 +1920,16 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat
assert(queue_index != TXCMD_QUEUE); assert(queue_index != TXCMD_QUEUE);
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev)); memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
skb_push(skb, priv->rtllib->tx_headroom); skb_push(skb, priv->rtllib->tx_headroom);
ret = rtl8192_tx(dev, skb); ret = rtl8192_tx(dev, skb);
if (ret != 0) { if (ret != 0) {
kfree_skb(skb); kfree_skb(skb);
}; };
if (queue_index!=MGNT_QUEUE) { if (queue_index != MGNT_QUEUE) {
priv->rtllib->stats.tx_bytes+=(skb->len - priv->rtllib->tx_headroom); priv->rtllib->stats.tx_bytes += (skb->len -
priv->rtllib->tx_headroom);
priv->rtllib->stats.tx_packets++; priv->rtllib->stats.tx_packets++;
} }
...@@ -1939,21 +1937,23 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat ...@@ -1939,21 +1937,23 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat
return; return;
} }
int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
int ret; int ret;
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +
MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index; u8 queue_index = tcb_desc->queue_index;
if (queue_index != TXCMD_QUEUE){ if (queue_index != TXCMD_QUEUE) {
if ((priv->rtllib->eRFPowerState == eRfOff) ||IS_NIC_DOWN(priv) || priv->bResetInProgress){ if ((priv->rtllib->eRFPowerState == eRfOff) ||
IS_NIC_DOWN(priv) || priv->bResetInProgress) {
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
} }
} }
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev)); memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
if (queue_index == TXCMD_QUEUE) { if (queue_index == TXCMD_QUEUE) {
rtl8192_tx_cmd(dev, skb); rtl8192_tx_cmd(dev, skb);
ret = 0; ret = 0;
...@@ -1998,22 +1998,20 @@ void rtl8192_tx_isr(struct net_device *dev, int prio) ...@@ -1998,22 +1998,20 @@ void rtl8192_tx_isr(struct net_device *dev, int prio)
kfree_skb(skb); kfree_skb(skb);
} }
if (prio != BEACON_QUEUE) { if (prio != BEACON_QUEUE)
tasklet_schedule(&priv->irq_tx_tasklet); tasklet_schedule(&priv->irq_tx_tasklet);
}
} }
void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb) void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring; struct rtl8192_tx_ring *ring;
struct tx_desc_cmd * entry; struct tx_desc_cmd *entry;
unsigned int idx; unsigned int idx;
struct cb_desc *tcb_desc; struct cb_desc *tcb_desc;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
ring = &priv->tx_ring[TXCMD_QUEUE]; ring = &priv->tx_ring[TXCMD_QUEUE];
idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries; idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
...@@ -2024,27 +2022,30 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb) ...@@ -2024,27 +2022,30 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb); priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb);
__skb_queue_tail(&ring->queue, skb); __skb_queue_tail(&ring->queue, skb);
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
return; return;
} }
short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring; struct rtl8192_tx_ring *ring;
unsigned long flags; unsigned long flags;
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +
MAX_DEV_ADDR_SIZE);
struct tx_desc *pdesc = NULL; struct tx_desc *pdesc = NULL;
struct rtllib_hdr_1addr * header = NULL; struct rtllib_hdr_1addr *header = NULL;
u16 fc=0, type=0,stype=0; u16 fc = 0, type = 0, stype = 0;
bool multi_addr=false,broad_addr=false,uni_addr=false; bool multi_addr = false, broad_addr = false, uni_addr = false;
u8* pda_addr = NULL; u8 *pda_addr = NULL;
int idx; int idx;
u32 fwinfo_size = 0; u32 fwinfo_size = 0;
if (priv->bdisable_nic){ if (priv->bdisable_nic) {
RT_TRACE(COMP_ERR,"%s: ERR!! Nic is disabled! Can't tx packet len=%d qidx=%d!!!\n", __func__, skb->len, tcb_desc->queue_index); RT_TRACE(COMP_ERR, "%s: ERR!! Nic is disabled! Can't tx packet"
" len=%d qidx=%d!!!\n", __func__, skb->len,
tcb_desc->queue_index);
return skb->len; return skb->len;
} }
...@@ -2052,7 +2053,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) ...@@ -2052,7 +2053,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
fwinfo_size = sizeof(struct tx_fwinfo_8190pci); fwinfo_size = sizeof(struct tx_fwinfo_8190pci);
header = (struct rtllib_hdr_1addr *)(((u8*)skb->data) + fwinfo_size); header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size);
fc = header->frame_ctl; fc = header->frame_ctl;
type = WLAN_FC_GET_TYPE(fc); type = WLAN_FC_GET_TYPE(fc);
stype = WLAN_FC_GET_STYPE(fc); stype = WLAN_FC_GET_STYPE(fc);
...@@ -2062,9 +2063,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) ...@@ -2062,9 +2063,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
multi_addr = true; multi_addr = true;
else if (is_broadcast_ether_addr(pda_addr)) else if (is_broadcast_ether_addr(pda_addr))
broad_addr = true; broad_addr = true;
else { else
uni_addr = true; uni_addr = true;
}
if (uni_addr) if (uni_addr)
priv->stats.txbytesunicast += skb->len - fwinfo_size; priv->stats.txbytesunicast += skb->len - fwinfo_size;
...@@ -2073,36 +2073,34 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) ...@@ -2073,36 +2073,34 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
else else
priv->stats.txbytesbroadcast += skb->len - fwinfo_size; priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
ring = &priv->tx_ring[tcb_desc->queue_index]; ring = &priv->tx_ring[tcb_desc->queue_index];
if (tcb_desc->queue_index != BEACON_QUEUE) { if (tcb_desc->queue_index != BEACON_QUEUE)
idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries; idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
} else { else
idx = 0; idx = 0;
}
pdesc = &ring->desc[idx]; pdesc = &ring->desc[idx];
if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) { if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) {
RT_TRACE(COMP_ERR,"No more TX desc@%d, ring->idx = %d,idx = %d, skblen = 0x%x queuelen=%d", \ RT_TRACE(COMP_ERR, "No more TX desc@%d, ring->idx = %d, idx = "
tcb_desc->queue_index,ring->idx, idx,skb->len, skb_queue_len(&ring->queue)); "%d, skblen = 0x%x queuelen=%d",
spin_unlock_irqrestore(&priv->irq_th_lock,flags); tcb_desc->queue_index, ring->idx, idx, skb->len,
skb_queue_len(&ring->queue));
spin_unlock_irqrestore(&priv->irq_th_lock, flags);
return skb->len; return skb->len;
} }
if (tcb_desc->queue_index == MGNT_QUEUE){ if (type == RTLLIB_FTYPE_DATA) {
}
if (type == RTLLIB_FTYPE_DATA){
if (priv->rtllib->LedControlHandler) if (priv->rtllib->LedControlHandler)
priv->rtllib->LedControlHandler(dev, LED_CTL_TX); priv->rtllib->LedControlHandler(dev, LED_CTL_TX);
} }
priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, skb); priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, skb);
__skb_queue_tail(&ring->queue, skb); __skb_queue_tail(&ring->queue, skb);
pdesc->OWN = 1; pdesc->OWN = 1;
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
dev->trans_start = jiffies; dev->trans_start = jiffies;
write_nic_word(dev,TPPoll,0x01<<tcb_desc->queue_index); write_nic_word(dev, TPPoll, 0x01 << tcb_desc->queue_index);
return 0; return 0;
} }
...@@ -2112,16 +2110,21 @@ short rtl8192_alloc_rx_desc_ring(struct net_device *dev) ...@@ -2112,16 +2110,21 @@ short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
struct rx_desc *entry = NULL; struct rx_desc *entry = NULL;
int i, rx_queue_idx; int i, rx_queue_idx;
for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){ for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) {
priv->rx_ring[rx_queue_idx] = pci_alloc_consistent(priv->pdev, priv->rx_ring[rx_queue_idx] = pci_alloc_consistent(priv->pdev,
sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, &priv->rx_ring_dma[rx_queue_idx]); sizeof(*priv->rx_ring[rx_queue_idx]) *
priv->rxringcount,
&priv->rx_ring_dma[rx_queue_idx]);
if (!priv->rx_ring[rx_queue_idx] || (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) { if (!priv->rx_ring[rx_queue_idx] ||
RT_TRACE(COMP_ERR,"Cannot allocate RX ring\n"); (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) {
RT_TRACE(COMP_ERR, "Cannot allocate RX ring\n");
return -ENOMEM; return -ENOMEM;
} }
memset(priv->rx_ring[rx_queue_idx], 0, sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount); memset(priv->rx_ring[rx_queue_idx], 0,
sizeof(*priv->rx_ring[rx_queue_idx]) *
priv->rxringcount);
priv->rx_idx[rx_queue_idx] = 0; priv->rx_idx[rx_queue_idx] = 0;
for (i = 0; i < priv->rxringcount; i++) { for (i = 0; i < priv->rxringcount; i++) {
...@@ -2133,8 +2136,10 @@ short rtl8192_alloc_rx_desc_ring(struct net_device *dev) ...@@ -2133,8 +2136,10 @@ short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
skb->dev = dev; skb->dev = dev;
priv->rx_buf[rx_queue_idx][i] = skb; priv->rx_buf[rx_queue_idx][i] = skb;
mapping = (dma_addr_t *)skb->cb; mapping = (dma_addr_t *)skb->cb;
*mapping = pci_map_single(priv->pdev, skb_tail_pointer_rsl(skb), *mapping = pci_map_single(priv->pdev,
priv->rxbuffersize, PCI_DMA_FROMDEVICE); skb_tail_pointer_rsl(skb),
priv->rxbuffersize,
PCI_DMA_FROMDEVICE);
entry->BufferAddress = cpu_to_le32(*mapping); entry->BufferAddress = cpu_to_le32(*mapping);
...@@ -2157,7 +2162,8 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev, ...@@ -2157,7 +2162,8 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma); ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);
if (!ring || (unsigned long)ring & 0xFF) { if (!ring || (unsigned long)ring & 0xFF) {
RT_TRACE(COMP_ERR, "Cannot allocate TX ring (prio = %d)\n", prio); RT_TRACE(COMP_ERR, "Cannot allocate TX ring (prio = %d)\n",
prio);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2170,7 +2176,8 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev, ...@@ -2170,7 +2176,8 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
for (i = 0; i < entries; i++) for (i = 0; i < entries; i++)
ring[i].NextDescAddress = ring[i].NextDescAddress =
cpu_to_le32((u32)dma + ((i + 1) % entries) * sizeof(*ring)); cpu_to_le32((u32)dma + ((i + 1) % entries) *
sizeof(*ring));
return 0; return 0;
} }
...@@ -2183,13 +2190,12 @@ short rtl8192_pci_initdescring(struct net_device *dev) ...@@ -2183,13 +2190,12 @@ short rtl8192_pci_initdescring(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
ret = rtl8192_alloc_rx_desc_ring(dev); ret = rtl8192_alloc_rx_desc_ring(dev);
if (ret) { if (ret)
return ret; return ret;
}
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) { for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
if ((ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount))) ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
if (ret)
goto err_free_rings; goto err_free_rings;
} }
...@@ -2206,10 +2212,10 @@ short rtl8192_pci_initdescring(struct net_device *dev) ...@@ -2206,10 +2212,10 @@ short rtl8192_pci_initdescring(struct net_device *dev)
void rtl8192_pci_resetdescring(struct net_device *dev) void rtl8192_pci_resetdescring(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
int i,rx_queue_idx; int i, rx_queue_idx;
unsigned long flags = 0; unsigned long flags = 0;
for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx ++){ for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) {
if (priv->rx_ring[rx_queue_idx]) { if (priv->rx_ring[rx_queue_idx]) {
struct rx_desc *entry = NULL; struct rx_desc *entry = NULL;
for (i = 0; i < priv->rxringcount; i++) { for (i = 0; i < priv->rxringcount; i++) {
...@@ -2220,16 +2226,18 @@ void rtl8192_pci_resetdescring(struct net_device *dev) ...@@ -2220,16 +2226,18 @@ void rtl8192_pci_resetdescring(struct net_device *dev)
} }
} }
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) { for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
if (priv->tx_ring[i].desc) { if (priv->tx_ring[i].desc) {
struct rtl8192_tx_ring *ring = &priv->tx_ring[i]; struct rtl8192_tx_ring *ring = &priv->tx_ring[i];
while (skb_queue_len(&ring->queue)) { while (skb_queue_len(&ring->queue)) {
struct tx_desc *entry = &ring->desc[ring->idx]; struct tx_desc *entry = &ring->desc[ring->idx];
struct sk_buff *skb = __skb_dequeue(&ring->queue); struct sk_buff *skb =
__skb_dequeue(&ring->queue);
pci_unmap_single(priv->pdev, le32_to_cpu(entry->TxBuffAddr), pci_unmap_single(priv->pdev,
le32_to_cpu(entry->TxBuffAddr),
skb->len, PCI_DMA_TODEVICE); skb->len, PCI_DMA_TODEVICE);
kfree_skb(skb); kfree_skb(skb);
ring->idx = (ring->idx + 1) % ring->entries; ring->idx = (ring->idx + 1) % ring->entries;
...@@ -2237,10 +2245,11 @@ void rtl8192_pci_resetdescring(struct net_device *dev) ...@@ -2237,10 +2245,11 @@ void rtl8192_pci_resetdescring(struct net_device *dev)
ring->idx = 0; ring->idx = 0;
} }
} }
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
} }
void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stats *stats) void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,
struct rtllib_rx_stats *stats)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
...@@ -2250,7 +2259,7 @@ void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stat ...@@ -2250,7 +2259,7 @@ void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stat
priv->LastRxDescTSF = stats->mac_time; priv->LastRxDescTSF = stats->mac_time;
} }
long rtl819x_translate_todbm(struct r8192_priv * priv, u8 signal_strength_index ) long rtl819x_translate_todbm(struct r8192_priv *priv, u8 signal_strength_index)
{ {
long signal_power; long signal_power;
...@@ -2263,48 +2272,41 @@ long rtl819x_translate_todbm(struct r8192_priv * priv, u8 signal_strength_index ...@@ -2263,48 +2272,41 @@ long rtl819x_translate_todbm(struct r8192_priv * priv, u8 signal_strength_index
void void
rtl819x_update_rxsignalstatistics8190pci( rtl819x_update_rxsignalstatistics8190pci(
struct r8192_priv * priv, struct r8192_priv *priv,
struct rtllib_rx_stats * pprevious_stats struct rtllib_rx_stats *pprevious_stats
) )
{ {
int weighting = 0; int weighting = 0;
if (priv->stats.recv_signal_power == 0) if (priv->stats.recv_signal_power == 0)
priv->stats.recv_signal_power = pprevious_stats->RecvSignalPower; priv->stats.recv_signal_power =
pprevious_stats->RecvSignalPower;
if (pprevious_stats->RecvSignalPower > priv->stats.recv_signal_power) if (pprevious_stats->RecvSignalPower > priv->stats.recv_signal_power)
weighting = 5; weighting = 5;
else if (pprevious_stats->RecvSignalPower < priv->stats.recv_signal_power) else if (pprevious_stats->RecvSignalPower <
priv->stats.recv_signal_power)
weighting = (-5); weighting = (-5);
priv->stats.recv_signal_power = (priv->stats.recv_signal_power * 5 + pprevious_stats->RecvSignalPower + weighting) / 6; priv->stats.recv_signal_power = (priv->stats.recv_signal_power * 5 +
pprevious_stats->RecvSignalPower +
weighting) / 6;
} }
void void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv,
rtl819x_process_cck_rxpathsel( struct rtllib_rx_stats *pprevious_stats)
struct r8192_priv * priv,
struct rtllib_rx_stats * pprevious_stats
)
{ {
} }
u8 rtl819x_query_rxpwrpercentage( u8 rtl819x_query_rxpwrpercentage(char antpower)
char antpower
)
{ {
if ((antpower <= -100) || (antpower >= 20)) if ((antpower <= -100) || (antpower >= 20))
{
return 0; return 0;
}
else if (antpower >= 0) else if (antpower >= 0)
{
return 100; return 100;
}
else else
{ return 100 + antpower;
return (100+antpower);
}
} /* QueryRxPwrPercentage */ } /* QueryRxPwrPercentage */
...@@ -2322,16 +2324,16 @@ rtl819x_evm_dbtopercentage( ...@@ -2322,16 +2324,16 @@ rtl819x_evm_dbtopercentage(
if (ret_val <= -33) if (ret_val <= -33)
ret_val = -33; ret_val = -33;
ret_val = 0 - ret_val; ret_val = 0 - ret_val;
ret_val*=3; ret_val *= 3;
if (ret_val == 99) if (ret_val == 99)
ret_val = 100; ret_val = 100;
return(ret_val); return ret_val;
} }
void void
rtl8192_record_rxdesc_forlateruse( rtl8192_record_rxdesc_forlateruse(
struct rtllib_rx_stats * psrc_stats, struct rtllib_rx_stats *psrc_stats,
struct rtllib_rx_stats * ptarget_stats struct rtllib_rx_stats *ptarget_stats
) )
{ {
ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU; ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU;
...@@ -2345,8 +2347,8 @@ void rtl8192_rx_normal(struct net_device *dev) ...@@ -2345,8 +2347,8 @@ void rtl8192_rx_normal(struct net_device *dev)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct rtllib_hdr_1addr *rtllib_hdr = NULL; struct rtllib_hdr_1addr *rtllib_hdr = NULL;
bool unicast_packet = false; bool unicast_packet = false;
bool bLedBlinking=true; bool bLedBlinking = true;
u16 fc=0, type=0; u16 fc = 0, type = 0;
u32 skb_len = 0; u32 skb_len = 0;
int rx_queue_idx = RX_MPDU_QUEUE; int rx_queue_idx = RX_MPDU_QUEUE;
...@@ -2361,8 +2363,10 @@ void rtl8192_rx_normal(struct net_device *dev) ...@@ -2361,8 +2363,10 @@ void rtl8192_rx_normal(struct net_device *dev)
stats.nic_type = NIC_8192E; stats.nic_type = NIC_8192E;
while (count--) { while (count--) {
struct rx_desc *pdesc = &priv->rx_ring[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; struct rx_desc *pdesc = &priv->rx_ring[rx_queue_idx]
struct sk_buff *skb = priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]]; [priv->rx_idx[rx_queue_idx]];
struct sk_buff *skb = priv->rx_buf[rx_queue_idx]
[priv->rx_idx[rx_queue_idx]];
if (pdesc->OWN) { if (pdesc->OWN) {
return; return;
...@@ -2405,14 +2409,14 @@ void rtl8192_rx_normal(struct net_device *dev) ...@@ -2405,14 +2409,14 @@ void rtl8192_rx_normal(struct net_device *dev)
if (stats.bCRC) { if (stats.bCRC) {
if (type != RTLLIB_FTYPE_MGMT) if (type != RTLLIB_FTYPE_MGMT)
priv->stats.rxdatacrcerr ++; priv->stats.rxdatacrcerr++;
else else
priv->stats.rxmgmtcrcerr ++; priv->stats.rxmgmtcrcerr++;
} }
skb_len = skb->len; skb_len = skb->len;
if (!rtllib_rx(priv->rtllib, skb, &stats)){ if (!rtllib_rx(priv->rtllib, skb, &stats)) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} else { } else {
priv->stats.rxok++; priv->stats.rxok++;
...@@ -2423,8 +2427,12 @@ void rtl8192_rx_normal(struct net_device *dev) ...@@ -2423,8 +2427,12 @@ void rtl8192_rx_normal(struct net_device *dev)
skb = new_skb; skb = new_skb;
skb->dev = dev; skb->dev = dev;
priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] = skb; priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] =
*((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer_rsl(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE); skb;
*((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev,
skb_tail_pointer_rsl(skb),
priv->rxbuffersize,
PCI_DMA_FROMDEVICE);
} }
done: done:
...@@ -2433,7 +2441,8 @@ void rtl8192_rx_normal(struct net_device *dev) ...@@ -2433,7 +2441,8 @@ void rtl8192_rx_normal(struct net_device *dev)
pdesc->Length = priv->rxbuffersize; pdesc->Length = priv->rxbuffersize;
if (priv->rx_idx[rx_queue_idx] == priv->rxringcount-1) if (priv->rx_idx[rx_queue_idx] == priv->rxringcount-1)
pdesc->EOR = 1; pdesc->EOR = 1;
priv->rx_idx[rx_queue_idx] = (priv->rx_idx[rx_queue_idx] + 1) % priv->rxringcount; priv->rx_idx[rx_queue_idx] = (priv->rx_idx[rx_queue_idx] + 1) %
priv->rxringcount;
} }
} }
...@@ -2450,11 +2459,12 @@ void rtl8192_tx_resume(struct net_device *dev) ...@@ -2450,11 +2459,12 @@ void rtl8192_tx_resume(struct net_device *dev)
struct sk_buff *skb; struct sk_buff *skb;
int queue_index; int queue_index;
for (queue_index = BK_QUEUE; queue_index < MAX_QUEUE_SIZE;queue_index++) { for (queue_index = BK_QUEUE;
while ((!skb_queue_empty(&ieee->skb_waitQ[queue_index]))&& queue_index < MAX_QUEUE_SIZE; queue_index++) {
(priv->rtllib->check_nic_enough_desc(dev,queue_index) > 0)) { while ((!skb_queue_empty(&ieee->skb_waitQ[queue_index])) &&
(priv->rtllib->check_nic_enough_desc(dev, queue_index) > 0)) {
skb = skb_dequeue(&ieee->skb_waitQ[queue_index]); skb = skb_dequeue(&ieee->skb_waitQ[queue_index]);
ieee->softmac_data_hard_start_xmit(skb,dev,0/* rate useless now*/); ieee->softmac_data_hard_start_xmit(skb, dev, 0);
} }
} }
} }
...@@ -2471,13 +2481,14 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv) ...@@ -2471,13 +2481,14 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)
if (MAX_RX_QUEUE > 1) if (MAX_RX_QUEUE > 1)
rtl8192_rx_cmd(priv->rtllib->dev); rtl8192_rx_cmd(priv->rtllib->dev);
write_nic_dword(priv->rtllib->dev, INTA_MASK,read_nic_dword(priv->rtllib->dev, INTA_MASK) | IMR_RDU); write_nic_dword(priv->rtllib->dev, INTA_MASK,
read_nic_dword(priv->rtllib->dev, INTA_MASK) | IMR_RDU);
} }
/**************************************************************************** /****************************************************************************
---------------------------- NIC START/CLOSE STUFF--------------------------- ---------------------------- NIC START/CLOSE STUFF---------------------------
*****************************************************************************/ *****************************************************************************/
void rtl8192_cancel_deferred_work(struct r8192_priv * priv) void rtl8192_cancel_deferred_work(struct r8192_priv *priv)
{ {
cancel_delayed_work(&priv->watch_dog_wq); cancel_delayed_work(&priv->watch_dog_wq);
cancel_delayed_work(&priv->update_beacon_wq); cancel_delayed_work(&priv->update_beacon_wq);
...@@ -2486,7 +2497,7 @@ void rtl8192_cancel_deferred_work(struct r8192_priv * priv) ...@@ -2486,7 +2497,7 @@ void rtl8192_cancel_deferred_work(struct r8192_priv * priv)
cancel_work_sync(&priv->qos_activate); cancel_work_sync(&priv->qos_activate);
} }
int _rtl8192_up(struct net_device *dev,bool is_silent_reset) int _rtl8192_up(struct net_device *dev, bool is_silent_reset)
{ {
if (_rtl8192_sta_up(dev, is_silent_reset) == -1) if (_rtl8192_sta_up(dev, is_silent_reset) == -1)
return -1; return -1;
...@@ -2511,8 +2522,9 @@ int rtl8192_up(struct net_device *dev) ...@@ -2511,8 +2522,9 @@ int rtl8192_up(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->up == 1) return -1; if (priv->up == 1)
return _rtl8192_up(dev,false); return -1;
return _rtl8192_up(dev, false);
} }
...@@ -2522,13 +2534,13 @@ int rtl8192_close(struct net_device *dev) ...@@ -2522,13 +2534,13 @@ int rtl8192_close(struct net_device *dev)
int ret; int ret;
if ((rtllib_act_scanning(priv->rtllib, false)) && if ((rtllib_act_scanning(priv->rtllib, false)) &&
!(priv->rtllib->softmac_features & IEEE_SOFTMAC_SCAN)){ !(priv->rtllib->softmac_features & IEEE_SOFTMAC_SCAN)) {
rtllib_stop_scan(priv->rtllib); rtllib_stop_scan(priv->rtllib);
} }
down(&priv->wx_sem); down(&priv->wx_sem);
ret = rtl8192_down(dev,true); ret = rtl8192_down(dev, true);
up(&priv->wx_sem); up(&priv->wx_sem);
...@@ -2548,16 +2560,18 @@ void rtl8192_commit(struct net_device *dev) ...@@ -2548,16 +2560,18 @@ void rtl8192_commit(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->up == 0) return ; if (priv->up == 0)
return;
rtllib_softmac_stop_protocol(priv->rtllib, 0 , true); rtllib_softmac_stop_protocol(priv->rtllib, 0 , true);
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
priv->ops->stop_adapter(dev, true); priv->ops->stop_adapter(dev, true);
_rtl8192_up(dev,false); _rtl8192_up(dev, false);
} }
void rtl8192_restart(void *data) void rtl8192_restart(void *data)
{ {
struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, reset_wq); struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
reset_wq);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
down(&priv->wx_sem); down(&priv->wx_sem);
...@@ -2572,14 +2586,7 @@ static void r8192_set_multicast(struct net_device *dev) ...@@ -2572,14 +2586,7 @@ static void r8192_set_multicast(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
short promisc; short promisc;
promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
promisc = (dev->flags & IFF_PROMISC) ? 1:0;
if (promisc != priv->promisc) {
;
}
priv->promisc = promisc; priv->promisc = promisc;
} }
...@@ -2605,26 +2612,25 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2605,26 +2612,25 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct iwreq *wrq = (struct iwreq *)rq; struct iwreq *wrq = (struct iwreq *)rq;
int ret=-1; int ret = -1;
struct rtllib_device *ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
u32 key[4]; u32 key[4];
u8 broadcast_addr[6] = {0xff,0xff,0xff,0xff,0xff,0xff}; u8 broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
u8 zero_addr[6] = {0}; u8 zero_addr[6] = {0};
struct iw_point *p = &wrq->u.data; struct iw_point *p = &wrq->u.data;
struct ieee_param *ipw = NULL;
down(&priv->wx_sem); down(&priv->wx_sem);
switch (cmd) { switch (cmd) {
case RTL_IOCTL_WPA_SUPPLICANT: case RTL_IOCTL_WPA_SUPPLICANT:
{ if (p->length < sizeof(struct ieee_param) || !p->pointer) {
struct ieee_param *ipw = NULL;
if (p->length < sizeof(struct ieee_param) || !p->pointer){
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
ipw = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL); ipw = kmalloc(p->length, GFP_KERNEL);
if (ipw == NULL){ if (ipw == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
...@@ -2634,85 +2640,87 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -2634,85 +2640,87 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
goto out; goto out;
} }
if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) {
{ if (ipw->u.crypt.set_tx) {
if (ipw->u.crypt.set_tx)
{
if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
ieee->pairwise_key_type = KEY_TYPE_CCMP; ieee->pairwise_key_type = KEY_TYPE_CCMP;
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0) else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
ieee->pairwise_key_type = KEY_TYPE_TKIP; ieee->pairwise_key_type = KEY_TYPE_TKIP;
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
{
if (ipw->u.crypt.key_len == 13) if (ipw->u.crypt.key_len == 13)
ieee->pairwise_key_type = KEY_TYPE_WEP104; ieee->pairwise_key_type =
KEY_TYPE_WEP104;
else if (ipw->u.crypt.key_len == 5) else if (ipw->u.crypt.key_len == 5)
ieee->pairwise_key_type = KEY_TYPE_WEP40; ieee->pairwise_key_type =
} KEY_TYPE_WEP40;
else } else {
ieee->pairwise_key_type = KEY_TYPE_NA; ieee->pairwise_key_type = KEY_TYPE_NA;
}
if (ieee->pairwise_key_type) if (ieee->pairwise_key_type) {
{ if (memcmp(ieee->ap_mac_addr, zero_addr,
if (memcmp(ieee->ap_mac_addr, zero_addr, 6) == 0) 6) == 0)
ieee->iw_mode = IW_MODE_ADHOC; ieee->iw_mode = IW_MODE_ADHOC;
memcpy((u8 *)key, ipw->u.crypt.key, 16);
memcpy((u8*)key, ipw->u.crypt.key, 16);
EnableHWSecurityConfig8192(dev); EnableHWSecurityConfig8192(dev);
set_swcam(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key,0); set_swcam(dev, 4, ipw->u.crypt.idx,
setKey(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key); ieee->pairwise_key_type,
if (ieee->iw_mode == IW_MODE_ADHOC){ (u8 *)ieee->ap_mac_addr,
set_swcam(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key,0); 0, key, 0);
setKey(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key); setKey(dev, 4, ipw->u.crypt.idx,
ieee->pairwise_key_type,
(u8 *)ieee->ap_mac_addr, 0, key);
if (ieee->iw_mode == IW_MODE_ADHOC) {
set_swcam(dev, ipw->u.crypt.idx,
ipw->u.crypt.idx,
ieee->pairwise_key_type,
(u8 *)ieee->ap_mac_addr,
0, key, 0);
setKey(dev, ipw->u.crypt.idx,
ipw->u.crypt.idx,
ieee->pairwise_key_type,
(u8 *)ieee->ap_mac_addr,
0, key);
} }
} }
if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) && ieee->pHTInfo->bCurrentHTSupport){ if ((ieee->pairwise_key_type == KEY_TYPE_CCMP)
&& ieee->pHTInfo->bCurrentHTSupport) {
write_nic_byte(dev, 0x173, 1); write_nic_byte(dev, 0x173, 1);
} }
} } else {
else memcpy((u8 *)key, ipw->u.crypt.key, 16);
{
memcpy((u8*)key, ipw->u.crypt.key, 16);
if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
ieee->group_key_type= KEY_TYPE_CCMP; ieee->group_key_type = KEY_TYPE_CCMP;
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0) else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
ieee->group_key_type = KEY_TYPE_TKIP; ieee->group_key_type = KEY_TYPE_TKIP;
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
{
if (ipw->u.crypt.key_len == 13) if (ipw->u.crypt.key_len == 13)
ieee->group_key_type = KEY_TYPE_WEP104; ieee->group_key_type =
KEY_TYPE_WEP104;
else if (ipw->u.crypt.key_len == 5) else if (ipw->u.crypt.key_len == 5)
ieee->group_key_type = KEY_TYPE_WEP40; ieee->group_key_type =
} KEY_TYPE_WEP40;
else } else
ieee->group_key_type = KEY_TYPE_NA; ieee->group_key_type = KEY_TYPE_NA;
if (ieee->group_key_type) if (ieee->group_key_type) {
{ set_swcam(dev, ipw->u.crypt.idx,
set_swcam( dev,
ipw->u.crypt.idx,
ipw->u.crypt.idx, ipw->u.crypt.idx,
ieee->group_key_type, ieee->group_key_type,
broadcast_addr, broadcast_addr, 0, key, 0);
0, setKey(dev, ipw->u.crypt.idx,
key,
0);
setKey( dev,
ipw->u.crypt.idx,
ipw->u.crypt.idx, ipw->u.crypt.idx,
ieee->group_key_type, ieee->group_key_type,
broadcast_addr, broadcast_addr, 0, key);
0,
key);
} }
} }
} }
ret = rtllib_wpa_supplicant_ioctl(priv->rtllib, &wrq->u.data, 0); ret = rtllib_wpa_supplicant_ioctl(priv->rtllib, &wrq->u.data,
0);
kfree(ipw); kfree(ipw);
break; break;
}
default: default:
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
...@@ -2728,40 +2736,48 @@ void FairBeacon(struct net_device *dev) ...@@ -2728,40 +2736,48 @@ void FairBeacon(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct rtllib_network *net = &priv->rtllib->current_network; struct rtllib_network *net = &priv->rtllib->current_network;
static u8 i=100; static u8 i = 100;
static u8 forceturn =0; static u8 forceturn;
u16 beaconint = net->beacon_interval; u16 beaconint = net->beacon_interval;
if (priv->rtllib->iw_mode != IW_MODE_ADHOC) if (priv->rtllib->iw_mode != IW_MODE_ADHOC)
return; return;
if (priv->bIbssCoordinator){ if (priv->bIbssCoordinator) {
i--; i--;
if (forceturn ==2){ if (forceturn == 2) {
forceturn =0; forceturn = 0;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_BEACON_INTERVAL, (u8*)(&beaconint)); priv->rtllib->SetHwRegHandler(dev,
i=100; HW_VAR_BEACON_INTERVAL,
(u8 *)(&beaconint));
i = 100;
} }
if (i<=94){ if (i <= 94) {
beaconint=beaconint+2; beaconint = beaconint+2;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_BEACON_INTERVAL, (u8*)(&beaconint)); priv->rtllib->SetHwRegHandler(dev,
forceturn =1; HW_VAR_BEACON_INTERVAL,
(u8 *)(&beaconint));
forceturn = 1;
} }
} else { } else {
i++; i++;
if (forceturn ==1){ if (forceturn == 1) {
forceturn =0; forceturn = 0;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_BEACON_INTERVAL, (u8*)(&beaconint)); priv->rtllib->SetHwRegHandler(dev,
i=100; HW_VAR_BEACON_INTERVAL,
(u8 *)(&beaconint));
i = 100;
} }
if (i>=106){ if (i >= 106) {
beaconint=beaconint-2; beaconint = beaconint-2;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_BEACON_INTERVAL, (u8*)(&beaconint)); priv->rtllib->SetHwRegHandler(dev,
forceturn =2; HW_VAR_BEACON_INTERVAL,
(u8 *)(&beaconint));
forceturn = 2;
} }
} }
} }
...@@ -2776,71 +2792,67 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) ...@@ -2776,71 +2792,67 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
u32 intb; u32 intb;
intb = 0; intb = 0;
if (priv->irq_enabled == 0){ if (priv->irq_enabled == 0)
goto done; goto done;
}
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
priv->ops->interrupt_recognized(dev, &inta, &intb); priv->ops->interrupt_recognized(dev, &inta, &intb);
priv->stats.shints++; priv->stats.shints++;
if (!inta) { if (!inta) {
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
goto done; goto done;
} }
if (inta == 0xffff) { if (inta == 0xffff) {
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
goto done; goto done;
} }
priv->stats.ints++; priv->stats.ints++;
if (!netif_running(dev)) { if (!netif_running(dev)) {
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
goto done; goto done;
} }
if (inta & IMR_TBDOK){ if (inta & IMR_TBDOK) {
RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); RT_TRACE(COMP_INTR, "beacon ok interrupt!\n");
priv->stats.txbeaconokint++; priv->stats.txbeaconokint++;
} }
if (inta & IMR_TBDER){ if (inta & IMR_TBDER) {
RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); RT_TRACE(COMP_INTR, "beacon ok interrupt!\n");
priv->stats.txbeaconerr++; priv->stats.txbeaconerr++;
} }
if (inta & IMR_BDOK) { if (inta & IMR_BDOK)
RT_TRACE(COMP_INTR, "beacon interrupt!\n"); RT_TRACE(COMP_INTR, "beacon interrupt!\n");
}
if (inta & IMR_MGNTDOK ) { if (inta & IMR_MGNTDOK) {
RT_TRACE(COMP_INTR, "Manage ok interrupt!\n"); RT_TRACE(COMP_INTR, "Manage ok interrupt!\n");
priv->stats.txmanageokint++; priv->stats.txmanageokint++;
rtl8192_tx_isr(dev,MGNT_QUEUE); rtl8192_tx_isr(dev, MGNT_QUEUE);
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
if (priv->rtllib->ack_tx_to_ieee){ if (priv->rtllib->ack_tx_to_ieee) {
if (rtl8192_is_tx_queue_empty(dev)){ if (rtl8192_is_tx_queue_empty(dev)) {
priv->rtllib->ack_tx_to_ieee = 0; priv->rtllib->ack_tx_to_ieee = 0;
rtllib_ps_tx_ack(priv->rtllib, 1); rtllib_ps_tx_ack(priv->rtllib, 1);
} }
} }
spin_lock_irqsave(&priv->irq_th_lock,flags); spin_lock_irqsave(&priv->irq_th_lock, flags);
} }
if (inta & IMR_COMDOK) { if (inta & IMR_COMDOK) {
priv->stats.txcmdpktokint++; priv->stats.txcmdpktokint++;
rtl8192_tx_isr(dev,TXCMD_QUEUE); rtl8192_tx_isr(dev, TXCMD_QUEUE);
} }
if (inta & IMR_HIGHDOK) { if (inta & IMR_HIGHDOK)
rtl8192_tx_isr(dev,HIGH_QUEUE); rtl8192_tx_isr(dev, HIGH_QUEUE);
}
if (inta & IMR_ROK) if (inta & IMR_ROK) {
{
priv->stats.rxint++; priv->stats.rxint++;
priv->InterruptLog.nIMR_ROK++; priv->InterruptLog.nIMR_ROK++;
tasklet_schedule(&priv->irq_rx_tasklet); tasklet_schedule(&priv->irq_rx_tasklet);
...@@ -2854,7 +2866,8 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) ...@@ -2854,7 +2866,8 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
if (inta & IMR_RDU) { if (inta & IMR_RDU) {
RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n"); RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n");
priv->stats.rxrdu++; priv->stats.rxrdu++;
write_nic_dword(dev,INTA_MASK,read_nic_dword(dev, INTA_MASK) & ~IMR_RDU); write_nic_dword(dev, INTA_MASK,
read_nic_dword(dev, INTA_MASK) & ~IMR_RDU);
tasklet_schedule(&priv->irq_rx_tasklet); tasklet_schedule(&priv->irq_rx_tasklet);
} }
...@@ -2864,37 +2877,38 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) ...@@ -2864,37 +2877,38 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
tasklet_schedule(&priv->irq_rx_tasklet); tasklet_schedule(&priv->irq_rx_tasklet);
} }
if (inta & IMR_TXFOVW) priv->stats.txoverflow++; if (inta & IMR_TXFOVW)
priv->stats.txoverflow++;
if (inta & IMR_BKDOK) { if (inta & IMR_BKDOK) {
RT_TRACE(COMP_INTR, "BK Tx OK interrupt!\n"); RT_TRACE(COMP_INTR, "BK Tx OK interrupt!\n");
priv->stats.txbkokint++; priv->stats.txbkokint++;
priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
rtl8192_tx_isr(dev,BK_QUEUE); rtl8192_tx_isr(dev, BK_QUEUE);
} }
if (inta & IMR_BEDOK) { if (inta & IMR_BEDOK) {
RT_TRACE(COMP_INTR, "BE TX OK interrupt!\n"); RT_TRACE(COMP_INTR, "BE TX OK interrupt!\n");
priv->stats.txbeokint++; priv->stats.txbeokint++;
priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
rtl8192_tx_isr(dev,BE_QUEUE); rtl8192_tx_isr(dev, BE_QUEUE);
} }
if (inta & IMR_VIDOK) { if (inta & IMR_VIDOK) {
RT_TRACE(COMP_INTR, "VI TX OK interrupt!\n"); RT_TRACE(COMP_INTR, "VI TX OK interrupt!\n");
priv->stats.txviokint++; priv->stats.txviokint++;
priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
rtl8192_tx_isr(dev,VI_QUEUE); rtl8192_tx_isr(dev, VI_QUEUE);
} }
if (inta & IMR_VODOK) { if (inta & IMR_VODOK) {
priv->stats.txvookint++; priv->stats.txvookint++;
RT_TRACE(COMP_INTR, "Vo TX OK interrupt!\n"); RT_TRACE(COMP_INTR, "Vo TX OK interrupt!\n");
priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
rtl8192_tx_isr(dev,VO_QUEUE); rtl8192_tx_isr(dev, VO_QUEUE);
} }
spin_unlock_irqrestore(&priv->irq_th_lock,flags); spin_unlock_irqrestore(&priv->irq_th_lock, flags);
done: done:
...@@ -2925,69 +2939,67 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -2925,69 +2939,67 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
{ {
unsigned long ioaddr = 0; unsigned long ioaddr = 0;
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct r8192_priv *priv= NULL; struct r8192_priv *priv = NULL;
struct rtl819x_ops *ops = (struct rtl819x_ops *)(id->driver_data); struct rtl819x_ops *ops = (struct rtl819x_ops *)(id->driver_data);
unsigned long pmem_start, pmem_len, pmem_flags; unsigned long pmem_start, pmem_len, pmem_flags;
int err = 0; int err = 0;
bool bdma64 = false; bool bdma64 = false;
u8 revision_id; u8 revision_id;
RT_TRACE(COMP_INIT,"Configuring chip resources"); RT_TRACE(COMP_INIT, "Configuring chip resources");
if ( pci_enable_device (pdev) ){ if (pci_enable_device(pdev)) {
RT_TRACE(COMP_ERR,"Failed to enable PCI device"); RT_TRACE(COMP_ERR, "Failed to enable PCI device");
return -EIO; return -EIO;
} }
pci_set_master(pdev); pci_set_master(pdev);
{
if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
printk( "Unable to obtain 32bit DMA for consistent allocations\n"); printk(KERN_INFO "Unable to obtain 32bit DMA for consistent allocations\n");
pci_disable_device(pdev); pci_disable_device(pdev);
return -ENOMEM; return -ENOMEM;
} }
} }
}
dev = alloc_rtllib(sizeof(struct r8192_priv)); dev = alloc_rtllib(sizeof(struct r8192_priv));
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
if (bdma64){ if (bdma64)
dev->features |= NETIF_F_HIGHDMA; dev->features |= NETIF_F_HIGHDMA;
}
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
priv = rtllib_priv(dev); priv = rtllib_priv(dev);
priv->rtllib = (struct rtllib_device *)netdev_priv_rsl(dev); priv->rtllib = (struct rtllib_device *)netdev_priv_rsl(dev);
priv->pdev=pdev; priv->pdev = pdev;
priv->rtllib->pdev=pdev; priv->rtllib->pdev = pdev;
if ((pdev->subsystem_vendor == PCI_VENDOR_ID_DLINK)&&(pdev->subsystem_device == 0x3304)) if ((pdev->subsystem_vendor == PCI_VENDOR_ID_DLINK) &&
(pdev->subsystem_device == 0x3304))
priv->rtllib->bSupportRemoteWakeUp = 1; priv->rtllib->bSupportRemoteWakeUp = 1;
else else
priv->rtllib->bSupportRemoteWakeUp = 0; priv->rtllib->bSupportRemoteWakeUp = 0;
pmem_start = pci_resource_start(pdev, 1); pmem_start = pci_resource_start(pdev, 1);
pmem_len = pci_resource_len(pdev, 1); pmem_len = pci_resource_len(pdev, 1);
pmem_flags = pci_resource_flags (pdev, 1); pmem_flags = pci_resource_flags(pdev, 1);
if (!(pmem_flags & IORESOURCE_MEM)) { if (!(pmem_flags & IORESOURCE_MEM)) {
RT_TRACE(COMP_ERR,"region #1 not a MMIO resource, aborting"); RT_TRACE(COMP_ERR, "region #1 not a MMIO resource, aborting");
goto fail; goto fail;
} }
printk("Memory mapped space start: 0x%08lx \n", pmem_start); printk(KERN_INFO "Memory mapped space start: 0x%08lx\n", pmem_start);
if (!request_mem_region(pmem_start, pmem_len, DRV_NAME)) { if (!request_mem_region(pmem_start, pmem_len, DRV_NAME)) {
RT_TRACE(COMP_ERR,"request_mem_region failed!"); RT_TRACE(COMP_ERR, "request_mem_region failed!");
goto fail; goto fail;
} }
ioaddr = (unsigned long)ioremap_nocache( pmem_start, pmem_len); ioaddr = (unsigned long)ioremap_nocache(pmem_start, pmem_len);
if ( ioaddr == (unsigned long)NULL ){ if (ioaddr == (unsigned long)NULL) {
RT_TRACE(COMP_ERR,"ioremap failed!"); RT_TRACE(COMP_ERR, "ioremap failed!");
goto fail1; goto fail1;
} }
...@@ -3019,19 +3031,21 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -3019,19 +3031,21 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
dev->hard_start_xmit = rtllib_xmit; dev->hard_start_xmit = rtllib_xmit;
#endif #endif
dev->wireless_handlers = (struct iw_handler_def *) &r8192_wx_handlers_def; dev->wireless_handlers = (struct iw_handler_def *)
&r8192_wx_handlers_def;
dev->ethtool_ops = &rtl819x_ethtool_ops; dev->ethtool_ops = &rtl819x_ethtool_ops;
dev->type = ARPHRD_ETHER; dev->type = ARPHRD_ETHER;
dev->watchdog_timeo = HZ*3; dev->watchdog_timeo = HZ * 3;
if (dev_alloc_name(dev, ifname) < 0){ if (dev_alloc_name(dev, ifname) < 0) {
RT_TRACE(COMP_INIT, "Oops: devname already taken! Trying wlan%%d...\n"); RT_TRACE(COMP_INIT, "Oops: devname already taken! Trying "
"wlan%%d...\n");
dev_alloc_name(dev, ifname); dev_alloc_name(dev, ifname);
} }
RT_TRACE(COMP_INIT, "Driver probe completed1\n"); RT_TRACE(COMP_INIT, "Driver probe completed1\n");
if (rtl8192_init(dev)!=0){ if (rtl8192_init(dev) != 0) {
RT_TRACE(COMP_ERR, "Initialization failed"); RT_TRACE(COMP_ERR, "Initialization failed");
goto fail1; goto fail1;
} }
...@@ -3040,33 +3054,31 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -3040,33 +3054,31 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
netif_stop_queue(dev); netif_stop_queue(dev);
register_netdev(dev); register_netdev(dev);
RT_TRACE(COMP_INIT, "dev name: %s\n",dev->name); RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
err = rtl_debug_module_init(priv, dev->name); err = rtl_debug_module_init(priv, dev->name);
if (err) { if (err)
RT_TRACE(COMP_DBG, "failed to create debugfs files. Ignoring error: %d\n", err); RT_TRACE(COMP_DBG, "failed to create debugfs files. Ignoring "
} "error: %d\n", err);
rtl8192_proc_init_one(dev); rtl8192_proc_init_one(dev);
if (priv->polling_timer_on == 0){ if (priv->polling_timer_on == 0)
check_rfctrl_gpio_timer((unsigned long)dev); check_rfctrl_gpio_timer((unsigned long)dev);
}
RT_TRACE(COMP_INIT, "Driver probe completed\n"); RT_TRACE(COMP_INIT, "Driver probe completed\n");
return 0; return 0;
fail1: fail1:
if ( dev->mem_start != (unsigned long)NULL ){ if (dev->mem_start != (unsigned long)NULL) {
iounmap( (void *)dev->mem_start ); iounmap((void *)dev->mem_start);
release_mem_region( pci_resource_start(pdev, 1), release_mem_region(pci_resource_start(pdev, 1),
pci_resource_len(pdev, 1) ); pci_resource_len(pdev, 1));
} }
fail: fail:
if (dev){ if (dev) {
if (priv->irq) { if (priv->irq) {
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
dev->irq=0; dev->irq = 0;
} }
free_rtllib(dev); free_rtllib(dev);
} }
...@@ -3083,7 +3095,9 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) ...@@ -3083,7 +3095,9 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct r8192_priv *priv ; struct r8192_priv *priv ;
if (dev){ u32 i;
if (dev) {
unregister_netdev(dev); unregister_netdev(dev);
priv = rtllib_priv(dev); priv = rtllib_priv(dev);
...@@ -3093,31 +3107,24 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) ...@@ -3093,31 +3107,24 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
priv->polling_timer_on = 0; priv->polling_timer_on = 0;
rtl_debug_module_remove(priv); rtl_debug_module_remove(priv);
rtl8192_proc_remove_one(dev); rtl8192_proc_remove_one(dev);
rtl8192_down(dev,true); rtl8192_down(dev, true);
deinit_hal_dm(dev); deinit_hal_dm(dev);
if (priv->pFirmware) { if (priv->pFirmware) {
vfree(priv->pFirmware); vfree(priv->pFirmware);
priv->pFirmware = NULL; priv->pFirmware = NULL;
} }
destroy_workqueue(priv->priv_wq); destroy_workqueue(priv->priv_wq);
{
u32 i;
rtl8192_free_rx_ring(dev); rtl8192_free_rx_ring(dev);
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) { for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
rtl8192_free_tx_ring(dev, i); rtl8192_free_tx_ring(dev, i);
}
}
if (priv->irq){
printk("Freeing irq %d\n",dev->irq); if (priv->irq) {
printk(KERN_INFO "Freeing irq %d\n", dev->irq);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
priv->irq=0; priv->irq = 0;
} }
free_rtllib(dev); free_rtllib(dev);
if (priv->scan_cmd)
kfree(priv->scan_cmd); kfree(priv->scan_cmd);
if (dev->mem_start != 0) { if (dev->mem_start != 0) {
...@@ -3125,31 +3132,34 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) ...@@ -3125,31 +3132,34 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
release_mem_region(pci_resource_start(pdev, 1), release_mem_region(pci_resource_start(pdev, 1),
pci_resource_len(pdev, 1)); pci_resource_len(pdev, 1));
} }
} else{ } else {
priv=rtllib_priv(dev); priv = rtllib_priv(dev);
} }
pci_disable_device(pdev); pci_disable_device(pdev);
RT_TRACE(COMP_DOWN, "wlan driver removed\n"); RT_TRACE(COMP_DOWN, "wlan driver removed\n");
} }
bool NicIFEnableNIC(struct net_device* dev) bool NicIFEnableNIC(struct net_device *dev)
{ {
bool init_status = true; bool init_status = true;
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)(&(priv->rtllib->PowerSaveControl)); struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
(&(priv->rtllib->PowerSaveControl));
if (IS_NIC_DOWN(priv)){ if (IS_NIC_DOWN(priv)) {
RT_TRACE(COMP_ERR, "ERR!!! %s(): Driver is already down!\n",__func__); RT_TRACE(COMP_ERR, "ERR!!! %s(): Driver is already down!\n",
__func__);
priv->bdisable_nic = false; priv->bdisable_nic = false;
return RT_STATUS_FAILURE; return RT_STATUS_FAILURE;
} }
RT_TRACE(COMP_PS, "===========>%s()\n",__func__); RT_TRACE(COMP_PS, "===========>%s()\n", __func__);
priv->bfirst_init = true; priv->bfirst_init = true;
init_status = priv->ops->initialize_adapter(dev); init_status = priv->ops->initialize_adapter(dev);
if (init_status != true) { if (init_status != true) {
RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization is failed!\n",__func__); RT_TRACE(COMP_ERR, "ERR!!! %s(): initialization is failed!\n",
__func__);
priv->bdisable_nic = false; priv->bdisable_nic = false;
return -1; return -1;
} }
...@@ -3159,15 +3169,15 @@ bool NicIFEnableNIC(struct net_device* dev) ...@@ -3159,15 +3169,15 @@ bool NicIFEnableNIC(struct net_device* dev)
rtl8192_irq_enable(dev); rtl8192_irq_enable(dev);
priv->bdisable_nic = false; priv->bdisable_nic = false;
RT_TRACE(COMP_PS,"<===========%s()\n",__func__); RT_TRACE(COMP_PS, "<===========%s()\n", __func__);
return init_status; return init_status;
} }
bool NicIFDisableNIC(struct net_device* dev) bool NicIFDisableNIC(struct net_device *dev)
{ {
bool status = true; bool status = true;
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 tmp_state = 0; u8 tmp_state = 0;
RT_TRACE(COMP_PS, "=========>%s()\n",__func__); RT_TRACE(COMP_PS, "=========>%s()\n", __func__);
priv->bdisable_nic = true; priv->bdisable_nic = true;
tmp_state = priv->rtllib->state; tmp_state = priv->rtllib->state;
rtllib_softmac_stop_protocol(priv->rtllib, 0, false); rtllib_softmac_stop_protocol(priv->rtllib, 0, false);
...@@ -3176,7 +3186,7 @@ bool NicIFDisableNIC(struct net_device* dev) ...@@ -3176,7 +3186,7 @@ bool NicIFDisableNIC(struct net_device* dev)
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
priv->ops->stop_adapter(dev, false); priv->ops->stop_adapter(dev, false);
RT_TRACE(COMP_PS, "<=========%s()\n",__func__); RT_TRACE(COMP_PS, "<=========%s()\n", __func__);
return status; return status;
} }
...@@ -3221,7 +3231,7 @@ static int __init rtl8192_pci_module_init(void) ...@@ -3221,7 +3231,7 @@ static int __init rtl8192_pci_module_init(void)
} }
rtl8192_proc_module_init(); rtl8192_proc_module_init();
if (0!=pci_register_driver(&rtl8192_pci_driver)) { if (0 != pci_register_driver(&rtl8192_pci_driver)) {
DMESG("No device found"); DMESG("No device found");
/*pci_unregister_driver (&rtl8192_pci_driver);*/ /*pci_unregister_driver (&rtl8192_pci_driver);*/
return -ENODEV; return -ENODEV;
...@@ -3248,13 +3258,14 @@ static void __exit rtl8192_pci_module_exit(void) ...@@ -3248,13 +3258,14 @@ static void __exit rtl8192_pci_module_exit(void)
void check_rfctrl_gpio_timer(unsigned long data) void check_rfctrl_gpio_timer(unsigned long data)
{ {
struct r8192_priv * priv = rtllib_priv((struct net_device *)data); struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
priv->polling_timer_on = 1; priv->polling_timer_on = 1;
queue_delayed_work_rsl(priv->priv_wq,&priv->gpio_change_rf_wq,0); queue_delayed_work_rsl(priv->priv_wq, &priv->gpio_change_rf_wq, 0);
mod_timer(&priv->gpio_polling_timer, jiffies + MSECS(RTLLIB_WATCH_DOG_TIME)); mod_timer(&priv->gpio_polling_timer, jiffies +
MSECS(RTLLIB_WATCH_DOG_TIME));
} }
/*************************************************************************** /***************************************************************************
...@@ -3268,10 +3279,10 @@ MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); ...@@ -3268,10 +3279,10 @@ MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(ifname, charp, S_IRUGO|S_IWUSR ); module_param(ifname, charp, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR); module_param(hwwep, int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR); module_param(channels, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(ifname," Net interface name, wlan%d=default"); MODULE_PARM_DESC(ifname, " Net interface name, wlan%d=default");
MODULE_PARM_DESC(hwwep," Try to use hardware WEP support(default use hw. set 0 to use software security)"); MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support(default use hw. set 0 to use software security)");
MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI"); MODULE_PARM_DESC(channels, " Channel bitmask for specific locales. NYI");
drivers/staging/rtl8192e/rtl_core.h
浏览文件 @ 1344ee25
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/version.h> #include <linux/version.h>
#include <asm/io.h> #include <linux/io.h>
#include "rtllib.h" #include "rtllib.h"
#include "dot11d.h" #include "dot11d.h"
...@@ -62,28 +62,35 @@ ...@@ -62,28 +62,35 @@
#include "rtl_pci.h" #include "rtl_pci.h"
#include "rtl_cam.h" #include "rtl_cam.h"
#define DRV_COPYRIGHT "Copyright(c) 2008 - 2010 Realsil Semiconductor Corporation" #define DRV_COPYRIGHT \
"Copyright(c) 2008 - 2010 Realsil Semiconductor Corporation"
#define DRV_AUTHOR "<wlanfae@realtek.com>" #define DRV_AUTHOR "<wlanfae@realtek.com>"
#define DRV_VERSION "0014.0401.2010" #define DRV_VERSION "0014.0401.2010"
#define DRV_NAME "rtl819xE" #define DRV_NAME "rtl819xE"
#define IS_HARDWARE_TYPE_819xP(_priv) ((((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8190P)||\ #define IS_HARDWARE_TYPE_819xP(_priv) \
(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192E)) ((((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8190P) || \
#define IS_HARDWARE_TYPE_8192SE(_priv) (((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192SE) (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192E))
#define IS_HARDWARE_TYPE_8192CE(_priv) (((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192CE) #define IS_HARDWARE_TYPE_8192SE(_priv) \
#define IS_HARDWARE_TYPE_8192CU(_priv) (((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192CU) (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192SE)
#define IS_HARDWARE_TYPE_8192DE(_priv) (((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192DE) #define IS_HARDWARE_TYPE_8192CE(_priv) \
#define IS_HARDWARE_TYPE_8192DU(_priv) (((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192DU) (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192CE)
#define IS_HARDWARE_TYPE_8192CU(_priv) \
(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192CU)
#define IS_HARDWARE_TYPE_8192DE(_priv) \
(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192DE)
#define IS_HARDWARE_TYPE_8192DU(_priv) \
(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192DU)
#define RTL_PCI_DEVICE(vend, dev, cfg) \ #define RTL_PCI_DEVICE(vend, dev, cfg) \
.vendor = (vend), .device = (dev), \ .vendor = (vend), .device = (dev), \
.subvendor = PCI_ANY_ID, .subdevice =PCI_ANY_ID , \ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID , \
.driver_data = (kernel_ulong_t)&(cfg) .driver_data = (kernel_ulong_t)&(cfg)
#define irqreturn_type irqreturn_t #define irqreturn_type irqreturn_t
#define rtl8192_interrupt(x,y,z) rtl8192_interrupt_rsl(x,y) #define rtl8192_interrupt(x, y, z) rtl8192_interrupt_rsl(x, y)
#define RTL_MAX_SCAN_SIZE 128 #define RTL_MAX_SCAN_SIZE 128
...@@ -100,7 +107,8 @@ ...@@ -100,7 +107,8 @@
#define IS_ADAPTER_SENDS_BEACON(dev) 0 #define IS_ADAPTER_SENDS_BEACON(dev) 0
#define IS_UNDER_11N_AES_MODE(_rtllib) ((_rtllib->pHTInfo->bCurrentHTSupport == true) &&\ #define IS_UNDER_11N_AES_MODE(_rtllib) \
((_rtllib->pHTInfo->bCurrentHTSupport == true) && \
(_rtllib->pairwise_key_type == KEY_TYPE_CCMP)) (_rtllib->pairwise_key_type == KEY_TYPE_CCMP))
#define HAL_MEMORY_MAPPED_IO_RANGE_8190PCI 0x1000 #define HAL_MEMORY_MAPPED_IO_RANGE_8190PCI 0x1000
...@@ -144,12 +152,14 @@ ...@@ -144,12 +152,14 @@
#define RTLLIB_WATCH_DOG_TIME 2000 #define RTLLIB_WATCH_DOG_TIME 2000
#define MAX_DEV_ADDR_SIZE 8 /* support till 64 bit bus width OS */ #define MAX_DEV_ADDR_SIZE 8 /*support till 64 bit bus width OS*/
#define MAX_FIRMWARE_INFORMATION_SIZE 32 #define MAX_FIRMWARE_INFORMATION_SIZE 32
#define MAX_802_11_HEADER_LENGTH (40 + MAX_FIRMWARE_INFORMATION_SIZE) #define MAX_802_11_HEADER_LENGTH (40 + MAX_FIRMWARE_INFORMATION_SIZE)
#define ENCRYPTION_MAX_OVERHEAD 128 #define ENCRYPTION_MAX_OVERHEAD 128
#define MAX_FRAGMENT_COUNT 8 #define MAX_FRAGMENT_COUNT 8
#define MAX_TRANSMIT_BUFFER_SIZE (1600+(MAX_802_11_HEADER_LENGTH+ENCRYPTION_MAX_OVERHEAD)*MAX_FRAGMENT_COUNT) #define MAX_TRANSMIT_BUFFER_SIZE \
(1600 + (MAX_802_11_HEADER_LENGTH + ENCRYPTION_MAX_OVERHEAD) * \
MAX_FRAGMENT_COUNT)
#define scrclng 4 #define scrclng 4
...@@ -164,7 +174,7 @@ ...@@ -164,7 +174,7 @@
#define PHY_RSSI_SLID_WIN_MAX 100 #define PHY_RSSI_SLID_WIN_MAX 100
#define RTL_IOCTL_WPA_SUPPLICANT SIOCIWFIRSTPRIV+30 #define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV + 30)
#define TxBBGainTableLength 37 #define TxBBGainTableLength 37
#define CCKTxBBGainTableLength 23 #define CCKTxBBGainTableLength 23
...@@ -185,8 +195,8 @@ ...@@ -185,8 +195,8 @@
enum RTL819x_PHY_PARAM { enum RTL819x_PHY_PARAM {
RTL819X_PHY_MACPHY_REG = 0, RTL819X_PHY_MACPHY_REG = 0,
RTL819X_PHY_MACPHY_REG_PG = 1, RTL819X_PHY_MACPHY_REG_PG = 1,
RTL8188C_PHY_MACREG =2, RTL8188C_PHY_MACREG = 2,
RTL8192C_PHY_MACREG =3, RTL8192C_PHY_MACREG = 3,
RTL819X_PHY_REG = 4, RTL819X_PHY_REG = 4,
RTL819X_PHY_REG_1T2R = 5, RTL819X_PHY_REG_1T2R = 5,
RTL819X_PHY_REG_to1T1R = 6, RTL819X_PHY_REG_to1T1R = 6,
...@@ -194,15 +204,15 @@ enum RTL819x_PHY_PARAM { ...@@ -194,15 +204,15 @@ enum RTL819x_PHY_PARAM {
RTL819X_PHY_REG_to2T2R = 8, RTL819X_PHY_REG_to2T2R = 8,
RTL819X_PHY_REG_PG = 9, RTL819X_PHY_REG_PG = 9,
RTL819X_AGC_TAB = 10, RTL819X_AGC_TAB = 10,
RTL819X_PHY_RADIO_A =11, RTL819X_PHY_RADIO_A = 11,
RTL819X_PHY_RADIO_A_1T =12, RTL819X_PHY_RADIO_A_1T = 12,
RTL819X_PHY_RADIO_A_2T =13, RTL819X_PHY_RADIO_A_2T = 13,
RTL819X_PHY_RADIO_B =14, RTL819X_PHY_RADIO_B = 14,
RTL819X_PHY_RADIO_B_GM =15, RTL819X_PHY_RADIO_B_GM = 15,
RTL819X_PHY_RADIO_C =16, RTL819X_PHY_RADIO_C = 16,
RTL819X_PHY_RADIO_D =17, RTL819X_PHY_RADIO_D = 17,
RTL819X_EEPROM_MAP =18, RTL819X_EEPROM_MAP = 18,
RTL819X_EFUSE_MAP =19, RTL819X_EFUSE_MAP = 19,
}; };
enum RTL_DEBUG { enum RTL_DEBUG {
...@@ -249,7 +259,7 @@ enum nic_t { ...@@ -249,7 +259,7 @@ enum nic_t {
NIC_8192CU = 6, NIC_8192CU = 6,
NIC_8192DE = 7, NIC_8192DE = 7,
NIC_8192DU = 8, NIC_8192DU = 8,
}; };
enum rt_eeprom_type { enum rt_eeprom_type {
EEPROM_93C46, EEPROM_93C46,
...@@ -272,7 +282,7 @@ enum rt_rf_type_819xu { ...@@ -272,7 +282,7 @@ enum rt_rf_type_819xu {
RF_8225, RF_8225,
RF_8256, RF_8256,
RF_8258, RF_8258,
RF_6052=4, RF_6052 = 4,
RF_PSEUDO_11N = 5, RF_PSEUDO_11N = 5,
}; };
...@@ -315,7 +325,7 @@ enum rt_customer_id { ...@@ -315,7 +325,7 @@ enum rt_customer_id {
RT_CID_819x_CAMEO1 = 22, RT_CID_819x_CAMEO1 = 22,
RT_CID_819x_MSI = 23, RT_CID_819x_MSI = 23,
RT_CID_819x_Acer = 24, RT_CID_819x_Acer = 24,
RT_CID_819x_HP =27, RT_CID_819x_HP = 27,
RT_CID_819x_CLEVO = 28, RT_CID_819x_CLEVO = 28,
RT_CID_819x_Arcadyan_Belkin = 29, RT_CID_819x_Arcadyan_Belkin = 29,
RT_CID_819x_SAMSUNG = 30, RT_CID_819x_SAMSUNG = 30,
...@@ -505,9 +515,9 @@ struct init_gain { ...@@ -505,9 +515,9 @@ struct init_gain {
}; };
struct tx_ring { struct tx_ring {
u32 * desc; u32 *desc;
u8 nStuckCount; u8 nStuckCount;
struct tx_ring * next; struct tx_ring *next;
} __packed; } __packed;
struct rtl8192_tx_ring { struct rtl8192_tx_ring {
...@@ -520,27 +530,39 @@ struct rtl8192_tx_ring { ...@@ -520,27 +530,39 @@ struct rtl8192_tx_ring {
struct rtl819x_ops{ struct rtl819x_ops {
enum nic_t nic_type; enum nic_t nic_type;
void (* get_eeprom_size)(struct net_device* dev); void (*get_eeprom_size)(struct net_device *dev);
void (* init_adapter_variable)(struct net_device* dev); void (*init_adapter_variable)(struct net_device *dev);
void (* init_before_adapter_start)(struct net_device* dev); void (*init_before_adapter_start)(struct net_device *dev);
bool (* initialize_adapter)(struct net_device* dev); bool (*initialize_adapter)(struct net_device *dev);
void (*link_change)(struct net_device* dev); void (*link_change)(struct net_device *dev);
void (* tx_fill_descriptor)(struct net_device* dev, struct tx_desc *tx_desc, struct cb_desc *cb_desc, struct sk_buff *skb); void (*tx_fill_descriptor)(struct net_device *dev,
void (* tx_fill_cmd_descriptor)(struct net_device* dev, struct tx_desc_cmd * entry, struct cb_desc *cb_desc, struct sk_buff *skb); struct tx_desc *tx_desc,
bool (* rx_query_status_descriptor)(struct net_device* dev, struct rtllib_rx_stats* stats, struct rx_desc *pdesc, struct sk_buff* skb); struct cb_desc *cb_desc,
bool (* rx_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, struct rx_desc *pdesc); struct sk_buff *skb);
void (* stop_adapter)(struct net_device *dev, bool reset); void (*tx_fill_cmd_descriptor)(struct net_device *dev,
void (* update_ratr_table)(struct net_device* dev); struct tx_desc_cmd *entry,
void (* irq_enable)(struct net_device* dev); struct cb_desc *cb_desc,
void (* irq_disable)(struct net_device* dev); struct sk_buff *skb);
void (* irq_clear)(struct net_device* dev); bool (*rx_query_status_descriptor)(struct net_device *dev,
void (* rx_enable)(struct net_device* dev); struct rtllib_rx_stats *stats,
void (* tx_enable)(struct net_device* dev); struct rx_desc *pdesc,
void (* interrupt_recognized)(struct net_device *dev, u32 *p_inta, u32 *p_intb); struct sk_buff *skb);
bool (* TxCheckStuckHandler)(struct net_device* dev); bool (*rx_command_packet_handler)(struct net_device *dev,
bool (* RxCheckStuckHandler)(struct net_device* dev); struct sk_buff *skb,
struct rx_desc *pdesc);
void (*stop_adapter)(struct net_device *dev, bool reset);
void (*update_ratr_table)(struct net_device *dev);
void (*irq_enable)(struct net_device *dev);
void (*irq_disable)(struct net_device *dev);
void (*irq_clear)(struct net_device *dev);
void (*rx_enable)(struct net_device *dev);
void (*tx_enable)(struct net_device *dev);
void (*interrupt_recognized)(struct net_device *dev,
u32 *p_inta, u32 *p_intb);
bool (*TxCheckStuckHandler)(struct net_device *dev);
bool (*RxCheckStuckHandler)(struct net_device *dev);
}; };
struct r8192_priv { struct r8192_priv {
...@@ -630,8 +652,8 @@ struct r8192_priv { ...@@ -630,8 +652,8 @@ struct r8192_priv {
struct iw_statistics wstats; struct iw_statistics wstats;
struct proc_dir_entry *dir_dev; struct proc_dir_entry *dir_dev;
short (*rf_set_sens)(struct net_device *dev,short sens); short (*rf_set_sens)(struct net_device *dev, short sens);
u8 (*rf_set_chan)(struct net_device *dev,u8 ch); u8 (*rf_set_chan)(struct net_device *dev, u8 ch);
void (*rf_close)(struct net_device *dev); void (*rf_close)(struct net_device *dev);
void (*rf_init)(struct net_device *dev); void (*rf_init)(struct net_device *dev);
...@@ -672,7 +694,10 @@ struct r8192_priv { ...@@ -672,7 +694,10 @@ struct r8192_priv {
/**********************************************************/ /**********************************************************/
enum card_type {PCI,MINIPCI,CARDBUS,USB}card_type; enum card_type {
PCI, MINIPCI,
CARDBUS, USB
} card_type;
struct work_struct qos_activate; struct work_struct qos_activate;
...@@ -727,7 +752,6 @@ struct r8192_priv { ...@@ -727,7 +752,6 @@ struct r8192_priv {
u32 last_rxdesc_tsf_high; u32 last_rxdesc_tsf_high;
u32 last_rxdesc_tsf_low; u32 last_rxdesc_tsf_low;
u16 basic_rate; u16 basic_rate;
u8 short_preamble; u8 short_preamble;
u8 dot11CurrentPreambleMode; u8 dot11CurrentPreambleMode;
...@@ -1016,41 +1040,42 @@ struct r8192_priv { ...@@ -1016,41 +1040,42 @@ struct r8192_priv {
extern const struct ethtool_ops rtl819x_ethtool_ops; extern const struct ethtool_ops rtl819x_ethtool_ops;
void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb); void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb);
short rtl8192_tx(struct net_device *dev, struct sk_buff* skb); short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
u8 read_nic_io_byte(struct net_device *dev, int x); u8 read_nic_io_byte(struct net_device *dev, int x);
u32 read_nic_io_dword(struct net_device *dev, int x); u32 read_nic_io_dword(struct net_device *dev, int x);
u16 read_nic_io_word(struct net_device *dev, int x) ; u16 read_nic_io_word(struct net_device *dev, int x) ;
void write_nic_io_byte(struct net_device *dev, int x,u8 y); void write_nic_io_byte(struct net_device *dev, int x, u8 y);
void write_nic_io_word(struct net_device *dev, int x,u16 y); void write_nic_io_word(struct net_device *dev, int x, u16 y);
void write_nic_io_dword(struct net_device *dev, int x,u32 y); void write_nic_io_dword(struct net_device *dev, int x, u32 y);
u8 read_nic_byte(struct net_device *dev, int x); u8 read_nic_byte(struct net_device *dev, int x);
u32 read_nic_dword(struct net_device *dev, int x); u32 read_nic_dword(struct net_device *dev, int x);
u16 read_nic_word(struct net_device *dev, int x) ; u16 read_nic_word(struct net_device *dev, int x) ;
void write_nic_byte(struct net_device *dev, int x,u8 y); void write_nic_byte(struct net_device *dev, int x, u8 y);
void write_nic_word(struct net_device *dev, int x,u16 y); void write_nic_word(struct net_device *dev, int x, u16 y);
void write_nic_dword(struct net_device *dev, int x,u32 y); void write_nic_dword(struct net_device *dev, int x, u32 y);
void force_pci_posting(struct net_device *dev); void force_pci_posting(struct net_device *dev);
void rtl8192_rx_enable(struct net_device *); void rtl8192_rx_enable(struct net_device *);
void rtl8192_tx_enable(struct net_device *); void rtl8192_tx_enable(struct net_device *);
int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev); int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate); void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
int rate);
void rtl8192_data_hard_stop(struct net_device *dev); void rtl8192_data_hard_stop(struct net_device *dev);
void rtl8192_data_hard_resume(struct net_device *dev); void rtl8192_data_hard_resume(struct net_device *dev);
void rtl8192_restart(void *data); void rtl8192_restart(void *data);
void rtl819x_watchdog_wqcallback(void *data); void rtl819x_watchdog_wqcallback(void *data);
void rtl8192_hw_sleep_wq (void *data); void rtl8192_hw_sleep_wq(void *data);
void watch_dog_timer_callback(unsigned long data); void watch_dog_timer_callback(unsigned long data);
void rtl8192_irq_rx_tasklet(struct r8192_priv *priv); void rtl8192_irq_rx_tasklet(struct r8192_priv *priv);
void rtl8192_irq_tx_tasklet(struct r8192_priv *priv); void rtl8192_irq_tx_tasklet(struct r8192_priv *priv);
int rtl8192_down(struct net_device *dev,bool shutdownrf); int rtl8192_down(struct net_device *dev, bool shutdownrf);
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 rtl8192_set_chan(struct net_device *dev, short ch);
void check_rfctrl_gpio_timer(unsigned long data); void check_rfctrl_gpio_timer(unsigned long data);
...@@ -1059,44 +1084,42 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs); ...@@ -1059,44 +1084,42 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs);
short rtl8192_pci_initdescring(struct net_device *dev); short rtl8192_pci_initdescring(struct net_device *dev);
void rtl8192_cancel_deferred_work(struct r8192_priv * priv); void rtl8192_cancel_deferred_work(struct r8192_priv *priv);
int _rtl8192_up(struct net_device *dev,bool is_silent_reset); int _rtl8192_up(struct net_device *dev, bool is_silent_reset);
short rtl8192_is_tx_queue_empty(struct net_device *dev); short rtl8192_is_tx_queue_empty(struct net_device *dev);
void rtl8192_irq_disable(struct net_device *dev); void rtl8192_irq_disable(struct net_device *dev);
void rtl8192_tx_timeout(struct net_device *dev); void rtl8192_tx_timeout(struct net_device *dev);
void rtl8192_pci_resetdescring(struct net_device *dev); void rtl8192_pci_resetdescring(struct net_device *dev);
void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode); void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode);
void rtl8192_irq_enable(struct net_device *dev); void rtl8192_irq_enable(struct net_device *dev);
void rtl8192_config_rate(struct net_device* dev, u16* rate_config); void rtl8192_config_rate(struct net_device *dev, u16 *rate_config);
void rtl8192_update_cap(struct net_device* dev, u16 cap); void rtl8192_update_cap(struct net_device *dev, u16 cap);
void rtl8192_irq_disable(struct net_device *dev); void rtl8192_irq_disable(struct net_device *dev);
void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stats *stats); void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,
long rtl819x_translate_todbm(struct r8192_priv * priv, u8 signal_strength_index ); struct rtllib_rx_stats *stats);
void rtl819x_update_rxsignalstatistics8190pci(struct r8192_priv * priv,struct rtllib_rx_stats * pprevious_stats); long rtl819x_translate_todbm(struct r8192_priv *priv, u8 signal_strength_index);
void rtl819x_update_rxsignalstatistics8190pci(struct r8192_priv *priv,
struct rtllib_rx_stats *pprevious_stats);
u8 rtl819x_evm_dbtopercentage(char value); u8 rtl819x_evm_dbtopercentage(char value);
void rtl819x_process_cck_rxpathsel(struct r8192_priv * priv,struct rtllib_rx_stats * pprevious_stats); void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv,
u8 rtl819x_query_rxpwrpercentage( char antpower ); struct rtllib_rx_stats *pprevious_stats);
void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats * psrc_stats,struct rtllib_rx_stats * ptarget_stats); u8 rtl819x_query_rxpwrpercentage(char antpower);
void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats *psrc_stats,
struct rtllib_rx_stats *ptarget_stats);
bool NicIFEnableNIC(struct net_device* dev); bool NicIFEnableNIC(struct net_device *dev);
bool NicIFDisableNIC(struct net_device* dev); bool NicIFDisableNIC(struct net_device *dev);
bool bool MgntActSet_RF_State(struct net_device *dev,
MgntActSet_RF_State(
struct net_device* dev,
enum rt_rf_power_state StateToSet, enum rt_rf_power_state StateToSet,
RT_RF_CHANGE_SOURCE ChangeSource, RT_RF_CHANGE_SOURCE ChangeSource,
bool ProtectOrNot bool ProtectOrNot);
); void ActUpdateChannelAccessSetting(struct net_device *dev,
void
ActUpdateChannelAccessSetting(
struct net_device* dev,
enum wireless_mode WirelessMode, enum wireless_mode WirelessMode,
struct channel_access_setting *ChnlAccessSetting struct channel_access_setting *ChnlAccessSetting);
);
#endif #endif
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或