Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126574
b: refs/heads/master
c: ac418b8
h: refs/heads/master
v: v3
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent dc44752 commit 3a225e2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 24 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: 42c84bb4603d5a375b1c8dbbbef686d24e804807
refs/heads/master: ac418b8faaaad7a17474c8fba5c2e5917c91cf31
17 changes: 3 additions & 14 deletions trunk/drivers/staging/winbond/adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,9 @@
#include "mto.h"
#include "wbhal_s.h"

#define OS_SET_SHUTDOWN( _A ) _A->shutdown=1
#define OS_SET_RESUME( _A ) _A->shutdown=0
#define OS_STOP( _A ) WBLINUX_stop( _A )
#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)

#define OS_CURRENT_RX_BYTE( _A ) _A->RxByteCount
#define OS_CURRENT_TX_BYTE( _A ) _A->TxByteCount
#define OS_EVENT_INDICATE( _A, _B, _F )
#define OS_PMKID_STATUS_EVENT( _A )
#define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D ) EAP_ReceivePacket( _A, _D )
#define OS_SEND_RESULT( _A, _ID, _R )

#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)

#define MAX_ANSI_STRING 40
#define WB_MAX_LINK_NAME_LEN 40

struct wb35_adapter {
u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point
Expand Down Expand Up @@ -49,7 +38,7 @@ struct wb35_adapter {
s32 netif_state_stop; // 1: stop 0: normal
struct iw_statistics iw_stats;

u8 LinkName[MAX_ANSI_STRING];
u8 LinkName[WB_MAX_LINK_NAME_LEN];
};

#endif
3 changes: 0 additions & 3 deletions trunk/drivers/staging/winbond/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,5 @@
#define WBDEBUG( _M ) 0
#endif

#define OS_EVENT_INDICATE( _A, _B, _F )
#define OS_PMKID_STATUS_EVENT( _A )

#endif // COMMON_DEF

1 change: 0 additions & 1 deletion trunk/drivers/staging/winbond/mds_s.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER
#define MAX_USB_TX_BUFFER 4096 // IS89C35 ability 4n alignment is required for hardware

#define MDS_EVENT_INDICATE( _A, _B, _F ) OS_EVENT_INDICATE( _A, _B, _F )
#define AUTH_REQUEST_PAIRWISE_ERROR 0 // _F flag setting
#define AUTH_REQUEST_GROUP_ERROR 1 // _F flag setting

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/winbond/wbhal.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ static void hal_led_control(unsigned long data)
else
{
// Is transmitting/receiving ??
if( (OS_CURRENT_RX_BYTE( adapter ) != pHwData->RxByteCountLast ) ||
(OS_CURRENT_TX_BYTE( adapter ) != pHwData->TxByteCountLast ) )
if( (adapter->RxByteCount != pHwData->RxByteCountLast ) ||
(adapter->TxByteCount != pHwData->TxByteCountLast ) )
{
if( (reg->U1BC_LEDConfigure & 0x3000) != 0x3000 )
{
Expand All @@ -233,8 +233,8 @@ static void hal_led_control(unsigned long data)
}

// Update variable
pHwData->RxByteCountLast = OS_CURRENT_RX_BYTE( adapter );
pHwData->TxByteCountLast = OS_CURRENT_TX_BYTE( adapter );
pHwData->RxByteCountLast = adapter->RxByteCount;
pHwData->TxByteCountLast = adapter->TxByteCount;
TimeInterval = 200;
}
else
Expand Down Expand Up @@ -849,7 +849,7 @@ void hal_surprise_remove(struct wb35_adapter *adapter)
#ifdef _PE_STATE_DUMP_
WBDEBUG(("Calling hal_surprise_remove\n"));
#endif
OS_STOP( adapter );
WBLINUX_stop( adapter );
}
}

Expand Down

0 comments on commit 3a225e2

Please sign in to comment.