Commit 8421513d authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman

Staging: w35und: remove some dead code

This patch removes the WBLinux_ReceivePacket(), WBLINUX_GetNextPacket(),
WBLINUX_GetNextPacketCompleted, and sme_get_rssi() functions, which execute
BUG() unconditionally, and related dead code.
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80aba536
...@@ -7,7 +7,6 @@ w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35r ...@@ -7,7 +7,6 @@ w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35r
phy_calibration.o \ phy_calibration.o \
reg.o \ reg.o \
rxisr.o \ rxisr.o \
sme_api.o \
wbhal.o \ wbhal.o \
wblinux.o \ wblinux.o \
......
...@@ -15,10 +15,7 @@ ...@@ -15,10 +15,7 @@
#define OS_CURRENT_TX_BYTE( _A ) _A->TxByteCount #define OS_CURRENT_TX_BYTE( _A ) _A->TxByteCount
#define OS_EVENT_INDICATE( _A, _B, _F ) #define OS_EVENT_INDICATE( _A, _B, _F )
#define OS_PMKID_STATUS_EVENT( _A ) #define OS_PMKID_STATUS_EVENT( _A )
#define OS_RECEIVE_PACKET_INDICATE( _A, _D ) WBLinux_ReceivePacket( _A, _D )
#define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D ) EAP_ReceivePacket( _A, _D ) #define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D ) EAP_ReceivePacket( _A, _D )
#define OS_GET_PACKET( _A, _D ) WBLINUX_GetNextPacket( _A, _D )
#define OS_GET_PACKET_COMPLETE( _A, _D ) WBLINUX_GetNextPacketCompleted( _A, _D )
#define OS_SEND_RESULT( _A, _ID, _R ) #define OS_SEND_RESULT( _A, _ID, _R )
#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) #define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)
......
...@@ -629,10 +629,3 @@ Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer ...@@ -629,10 +629,3 @@ Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer
//--end 20061009 add //--end 20061009 add
} }
void MDS_EthernetPacketReceive( struct wb35_adapter * adapter, PRXLAYER1 pRxLayer1 )
{
OS_RECEIVE_PACKET_INDICATE( adapter, pRxLayer1 );
}
...@@ -28,6 +28,5 @@ u16 MDS_GetPacketSize( struct wb35_adapter *adapter ); ...@@ -28,6 +28,5 @@ u16 MDS_GetPacketSize( struct wb35_adapter *adapter );
void MDS_GetNextPacket( struct wb35_adapter *adapter, PDESCRIPTOR pDes ); void MDS_GetNextPacket( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void MDS_GetNextPacketComplete( struct wb35_adapter *adapter, PDESCRIPTOR pDes ); void MDS_GetNextPacketComplete( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK ); void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK );
void MDS_EthernetPacketReceive( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 );
#endif #endif
This diff is collapsed.
//------------------------------------------------------------------------------------
// sme_api.c
//
// Copyright(C) 2002 Winbond Electronics Corp.
//
//
//------------------------------------------------------------------------------------
#include "os_common.h"
#include <linux/kernel.h>
s8 sme_get_rssi(void *pcore_data, s32 *prssi)
{
BUG();
return 0;
}
...@@ -56,9 +56,6 @@ s8 sme_set_fragment_threshold(void *pcore_data, u32 threshold); ...@@ -56,9 +56,6 @@ s8 sme_set_fragment_threshold(void *pcore_data, u32 threshold);
s8 sme_get_rts_threshold(void *pcore_data, u32 *pthreshold); s8 sme_get_rts_threshold(void *pcore_data, u32 *pthreshold);
s8 sme_set_rts_threshold(void *pcore_data, u32 threshold); s8 sme_set_rts_threshold(void *pcore_data, u32 threshold);
// OID_802_11_RSSI
s8 sme_get_rssi(void *pcore_data, s32 *prssi);
// OID_802_11_CONFIGURATION // OID_802_11_CONFIGURATION
s8 sme_get_beacon_period(void *pcore_data, u16 *pbeacon_period); s8 sme_get_beacon_period(void *pcore_data, u16 *pbeacon_period);
s8 sme_set_beacon_period(void *pcore_data, u16 beacon_period); s8 sme_set_beacon_period(void *pcore_data, u16 beacon_period);
......
...@@ -23,25 +23,6 @@ WBLINUX_Initial(struct wb35_adapter * adapter) ...@@ -23,25 +23,6 @@ WBLINUX_Initial(struct wb35_adapter * adapter)
return true; return true;
} }
void
WBLinux_ReceivePacket(struct wb35_adapter * adapter, PRXLAYER1 pRxLayer1)
{
BUG();
}
void
WBLINUX_GetNextPacket(struct wb35_adapter * adapter, PDESCRIPTOR pDes)
{
BUG();
}
void
WBLINUX_GetNextPacketCompleted(struct wb35_adapter * adapter, PDESCRIPTOR pDes)
{
BUG();
}
void void
WBLINUX_Destroy(struct wb35_adapter * adapter) WBLINUX_Destroy(struct wb35_adapter * adapter)
{ {
......
...@@ -9,11 +9,8 @@ ...@@ -9,11 +9,8 @@
// //
// wblinux_f.h // wblinux_f.h
// //
void WBLinux_ReceivePacket( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 );
unsigned char WBLINUX_Initial( struct wb35_adapter *adapter ); unsigned char WBLINUX_Initial( struct wb35_adapter *adapter );
int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev ); int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev );
void WBLINUX_GetNextPacket( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void WBLINUX_GetNextPacketCompleted( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void WBLINUX_stop( struct wb35_adapter *adapter ); void WBLINUX_stop( struct wb35_adapter *adapter );
void WBLINUX_Destroy( struct wb35_adapter *adapter ); void WBLINUX_Destroy( struct wb35_adapter *adapter );
void wb35_set_multicast( struct net_device *netdev ); void wb35_set_multicast( struct net_device *netdev );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment