Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197072
b: refs/heads/master
c: 4095aef
h: refs/heads/master
v: v3
  • Loading branch information
Ruslan Pisarev authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 0a3497d commit 66a22cb
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25e47dfc863406a29d7e66c4d673cc712647b50f
refs/heads/master: 4095aef6dc485545ebbd96d23eac0b11b729e765
62 changes: 31 additions & 31 deletions trunk/drivers/staging/winbond/mlmetxrx.c
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
//============================================================================
// Module Name:
// MLMETxRx.C
//
// Description:
// The interface between MDS (MAC Data Service) and MLME.
//
// Revision History:
// --------------------------------------------------------------------------
// 200209 UN20 Jennifer Xu
// Initial Release
// 20021108 PD43 Austin Liu
// 20030117 PD43 Austin Liu
// Deleted MLMEReturnPacket and MLMEProcThread()
//
// Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
//============================================================================
/* ============================================================================
Module Name:
MLMETxRx.C
Description:
The interface between MDS (MAC Data Service) and MLME.
Revision History:
--------------------------------------------------------------------------
200209 UN20 Jennifer Xu
Initial Release
20021108 PD43 Austin Liu
20030117 PD43 Austin Liu
Deleted MLMEReturnPacket and MLMEProcThread()
Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
============================================================================ */
#include "sysdef.h"

#include "mds_f.h"

//=============================================================================
u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
/* ============================================================================= */
u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *pMMPDU, u16 len, u8 DataType)
/* DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
FRAME_TYPE_802_11_DATA */
{
Expand All @@ -30,17 +30,17 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
}
adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;

// Keep information for sending
/* Keep information for sending */
adapter->sMlmeFrame.pMMPDU = pMMPDU;
adapter->sMlmeFrame.DataType = DataType;
// len must be the last setting due to QUERY_SIZE_SECOND of Mds
/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
adapter->sMlmeFrame.len = len;
adapter->sMlmeFrame.wNumTxMMPDU++;

// H/W will enter power save by set the register. S/W don't send null frame
//with PWRMgt bit enbled to enter power save now.
/* H/W will enter power save by set the register. S/W don't send null frame
with PWRMgt bit enbled to enter power save now. */

// Transmit NDIS packet
/* Transmit NDIS packet */
Mds_Tx(adapter);
return true;
}
Expand All @@ -60,32 +60,32 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
{
int i;

// Reclaim the data buffer
/* Reclaim the data buffer */
for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
break;
}
if (adapter->sMlmeFrame.TxMMPDUInUse[i])
adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
else {
// Something wrong
// PD43 Add debug code here???
/* Something wrong
PD43 Add debug code here??? */
}
}

void
MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
{
MLME_TXCALLBACK TxCallback;

// Reclaim the data buffer
/* Reclaim the data buffer */
adapter->sMlmeFrame.len = 0;
MLMEfreeMMPDUBuffer( adapter, adapter->sMlmeFrame.pMMPDU );
MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);


TxCallback.bResult = MLME_SUCCESS;

// Return resource
/* Return resource */
adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
}

Expand Down

0 comments on commit 66a22cb

Please sign in to comment.