Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 281351
b: refs/heads/master
c: dd751d2
h: refs/heads/master
i:
  281349: 8746b0a
  281347: 7d8615a
  281343: 1e38ce0
v: v3
  • Loading branch information
Johannes Tenschert authored and Greg Kroah-Hartman committed Dec 13, 2011
1 parent 7d9132b commit e183cf6
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6a918274116d8edc25eb20f6097dedf97b108e2
refs/heads/master: dd751d2a2bbd619081074d25f3f2ebcb1fb29b9e
136 changes: 68 additions & 68 deletions trunk/drivers/staging/bcm/HandleControlPacket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,53 +13,53 @@ Enqueue the control packet for Application.
*/
static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
{
PPER_TARANG_DATA pTarang = NULL;
PPER_TARANG_DATA pTarang = NULL;
BOOLEAN HighPriorityMessage = FALSE;
struct sk_buff * newPacket = NULL;
struct sk_buff *newPacket = NULL;
CHAR cntrl_msg_mask_bit = 0;
BOOLEAN drop_pkt_flag = TRUE ;
BOOLEAN drop_pkt_flag = TRUE;
USHORT usStatus = *(PUSHORT)(skb->data);

if (netif_msg_pktdata(Adapter))
print_hex_dump(KERN_DEBUG, PFX "rx control: ", DUMP_PREFIX_NONE,
16, 1, skb->data, skb->len, 0);
16, 1, skb->data, skb->len, 0);

switch(usStatus)
switch (usStatus)
{
case CM_RESPONSES: // 0xA0
BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "MAC Version Seems to be Non Multi-Classifier, rejected by Driver");
HighPriorityMessage = TRUE ;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "MAC Version Seems to be Non Multi-Classifier, rejected by Driver");
HighPriorityMessage = TRUE;
break;
case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
HighPriorityMessage = TRUE ;
if(Adapter->LinkStatus==LINKUP_DONE)
HighPriorityMessage = TRUE;
if (Adapter->LinkStatus == LINKUP_DONE)
{
CmControlResponseMessage(Adapter,(skb->data +sizeof(USHORT)));
CmControlResponseMessage(Adapter, (skb->data + sizeof(USHORT)));
}
break;
case LINK_CONTROL_RESP: //0xA2
case STATUS_RSP: //0xA1
BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"LINK_CONTROL_RESP");
HighPriorityMessage = TRUE ;
LinkControlResponseMessage(Adapter,(skb->data + sizeof(USHORT)));
case STATUS_RSP: //0xA1
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "LINK_CONTROL_RESP");
HighPriorityMessage = TRUE;
LinkControlResponseMessage(Adapter, (skb->data + sizeof(USHORT)));
break;
case STATS_POINTER_RESP: //0xA6
HighPriorityMessage = TRUE ;
case STATS_POINTER_RESP: //0xA6
HighPriorityMessage = TRUE;
StatisticsResponse(Adapter, (skb->data + sizeof(USHORT)));
break;
case IDLE_MODE_STATUS: //0xA3
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"IDLE_MODE_STATUS Type Message Got from F/W");
case IDLE_MODE_STATUS: //0xA3
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "IDLE_MODE_STATUS Type Message Got from F/W");
InterfaceIdleModeRespond(Adapter, (PUINT)(skb->data +
sizeof(USHORT)));
HighPriorityMessage = TRUE ;
HighPriorityMessage = TRUE;
break;

case AUTH_SS_HOST_MSG:
HighPriorityMessage = TRUE ;
HighPriorityMessage = TRUE;
break;

default:
BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"Got Default Response");
default:
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Got Default Response");
/* Let the Application Deal with This Packet */
break;
}
Expand All @@ -68,25 +68,25 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
down(&Adapter->RxAppControlQueuelock);

for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next)
{
if(Adapter->device_removed)
{
if (Adapter->device_removed)
{
break;
}

drop_pkt_flag = TRUE ;
drop_pkt_flag = TRUE;
/*
There are cntrl msg from A0 to AC. It has been mapped to 0 to C bit in the cntrl mask.
Also, by default AD to BF has been masked to the rest of the bits... which wil be ON by default.
if mask bit is enable to particular pkt status, send it out to app else stop it.
*/
cntrl_msg_mask_bit = (usStatus & 0x1F);
//printk("\ninew msg mask bit which is disable in mask:%X", cntrl_msg_mask_bit);
if(pTarang->RxCntrlMsgBitMask & (1<<cntrl_msg_mask_bit))
if (pTarang->RxCntrlMsgBitMask & (1 << cntrl_msg_mask_bit))
drop_pkt_flag = FALSE;

if ((drop_pkt_flag == TRUE) || (pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN) ||
((pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN/2) && (HighPriorityMessage == FALSE)))
((pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN / 2) && (HighPriorityMessage == FALSE)))
{
/*
Assumption:-
Expand All @@ -95,14 +95,14 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
pkt by that tarang only.
*/
switch(*(PUSHORT)skb->data)
switch (*(PUSHORT)skb->data)
{
case CM_RESPONSES:
pTarang->stDroppedAppCntrlMsgs.cm_responses++;
break;
case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
pTarang->stDroppedAppCntrlMsgs.cm_control_newdsx_multiclassifier_resp++;
break;
break;
case LINK_CONTROL_RESP:
pTarang->stDroppedAppCntrlMsgs.link_control_resp++;
break;
Expand All @@ -113,83 +113,83 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
pTarang->stDroppedAppCntrlMsgs.stats_pointer_resp++;
break;
case IDLE_MODE_STATUS:
pTarang->stDroppedAppCntrlMsgs.idle_mode_status++ ;
pTarang->stDroppedAppCntrlMsgs.idle_mode_status++;
break;
case AUTH_SS_HOST_MSG:
pTarang->stDroppedAppCntrlMsgs.auth_ss_host_msg++ ;
pTarang->stDroppedAppCntrlMsgs.auth_ss_host_msg++;
break;
default:
pTarang->stDroppedAppCntrlMsgs.low_priority_message++ ;
pTarang->stDroppedAppCntrlMsgs.low_priority_message++;
break;
}

continue;
}

newPacket = skb_clone(skb, GFP_KERNEL);
if (!newPacket)
break;
ENQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail,
newPacket = skb_clone(skb, GFP_KERNEL);
if (!newPacket)
break;
ENQUEUEPACKET(pTarang->RxAppControlHead, pTarang->RxAppControlTail,
newPacket);
pTarang->AppCtrlQueueLen++;
}
pTarang->AppCtrlQueueLen++;
}
up(&Adapter->RxAppControlQueuelock);
wake_up(&Adapter->process_read_wait_queue);
dev_kfree_skb(skb);
BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");
wake_up(&Adapter->process_read_wait_queue);
dev_kfree_skb(skb);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");
}

/**
@ingroup ctrl_pkt_functions
Thread to handle control pkt reception
*/
int control_packet_handler (PMINI_ADAPTER Adapter /**< pointer to adapter object*/
int control_packet_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
)
{
struct sk_buff *ctrl_packet= NULL;
struct sk_buff *ctrl_packet = NULL;
unsigned long flags = 0;
//struct timeval tv ;
//int *puiBuffer = NULL ;
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Entering to make thread wait on control packet event!");
while(1)
//struct timeval tv;
//int *puiBuffer = NULL;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Entering to make thread wait on control packet event!");
while (1)
{
wait_event_interruptible(Adapter->process_rx_cntrlpkt,
atomic_read(&Adapter->cntrlpktCnt) ||
Adapter->bWakeUpDevice ||
kthread_should_stop()
atomic_read(&Adapter->cntrlpktCnt) ||
Adapter->bWakeUpDevice ||
kthread_should_stop()
);


if(kthread_should_stop())
if (kthread_should_stop())
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Exiting \n");
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Exiting\n");
return 0;
}
if(TRUE == Adapter->bWakeUpDevice)
if (TRUE == Adapter->bWakeUpDevice)
{
Adapter->bWakeUpDevice = FALSE;
if((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode) &&
((TRUE == Adapter->IdleMode)|| (TRUE == Adapter->bShutStatus)))
if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode) &&
((TRUE == Adapter->IdleMode) || (TRUE == Adapter->bShutStatus)))
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Calling InterfaceAbortIdlemode\n");
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Calling InterfaceAbortIdlemode\n");
// Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
InterfaceIdleModeWakeup (Adapter);
InterfaceIdleModeWakeup(Adapter);
}
continue;
}

while(atomic_read(&Adapter->cntrlpktCnt))
while (atomic_read(&Adapter->cntrlpktCnt))
{
spin_lock_irqsave(&Adapter->control_queue_lock, flags);
ctrl_packet = Adapter->RxControlHead;
if(ctrl_packet)
if (ctrl_packet)
{
DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail);
DEQUEUEPACKET(Adapter->RxControlHead, Adapter->RxControlTail);
// Adapter->RxControlHead=ctrl_packet->next;
}

spin_unlock_irqrestore (&Adapter->control_queue_lock, flags);
handle_rx_control_packet(Adapter, ctrl_packet);
spin_unlock_irqrestore(&Adapter->control_queue_lock, flags);
handle_rx_control_packet(Adapter, ctrl_packet);
atomic_dec(&Adapter->cntrlpktCnt);
}

Expand All @@ -201,22 +201,22 @@ int control_packet_handler (PMINI_ADAPTER Adapter /**< pointer to adapter obje
INT flushAllAppQ(void)
{
PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
PPER_TARANG_DATA pTarang = NULL;
PPER_TARANG_DATA pTarang = NULL;
struct sk_buff *PacketToDrop = NULL;
for(pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next)
for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next)
{
while(pTarang->RxAppControlHead != NULL)
while (pTarang->RxAppControlHead != NULL)
{
PacketToDrop=pTarang->RxAppControlHead;
DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail);
PacketToDrop = pTarang->RxAppControlHead;
DEQUEUEPACKET(pTarang->RxAppControlHead, pTarang->RxAppControlTail);
dev_kfree_skb(PacketToDrop);
}
pTarang->AppCtrlQueueLen = 0;
//dropped contrl packet statistics also should be reset.
memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0, sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));

}
return STATUS_SUCCESS ;
return STATUS_SUCCESS;
}


0 comments on commit e183cf6

Please sign in to comment.