KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar6000: use net_device_ops

Browse source 
SVN-Revision: 16959
This commit is contained in:
Lars-Peter Clausen 2009-07-22 21:34:11 +00:00
parent b154676401
commit ed7f37826e
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.c
View file

@ -48,7 +48,6 @@ A_TIMER aptcTimer;
APTC_TRAFFIC_RECORD aptcTR; APTC_TRAFFIC_RECORD aptcTR;
#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */ #endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
int bmienable = 0;
unsigned int bypasswmi = 0; unsigned int bypasswmi = 0;
unsigned int debuglevel = 0; unsigned int debuglevel = 0;
int tspecCompliance = 1; int tspecCompliance = 1;
@ -68,7 +67,6 @@ unsigned int testmode =0;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
module_param(bmienable, int, 0644);
module_param(bypasswmi, int, 0644); module_param(bypasswmi, int, 0644);
module_param(debuglevel, int, 0644); module_param(debuglevel, int, 0644);
module_param(tspecCompliance, int, 0644); module_param(tspecCompliance, int, 0644);
@ -90,7 +88,6 @@ module_param(testmode, int, 0644);
#define __user #define __user
/* for linux 2.4 and lower */ /* for linux 2.4 and lower */
MODULE_PARM(bmienable,"i");
MODULE_PARM(bypasswmi,"i"); MODULE_PARM(bypasswmi,"i");
MODULE_PARM(debuglevel, "i"); MODULE_PARM(debuglevel, "i");
MODULE_PARM(onebitmode,"i"); MODULE_PARM(onebitmode,"i");
@ -701,6 +698,14 @@ static int alloc_raw_buffers(AR_SOFTC_T *ar)
return 0; return 0;
} }
static const struct net_device_ops ar6000_netdev_ops = {
.ndo_init = &ar6000_init,
.ndo_open = &ar6000_open,
.ndo_stop = &ar6000_close,
.ndo_start_xmit = &ar6000_data_tx,
.ndo_get_stats = &ar6000_get_stats,
.ndo_do_ioctl = &ar6000_ioctl,
};
/* /*
* HTC Event handlers * HTC Event handlers
*/ */
@ -858,21 +863,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
spin_lock_init(&ar->arLock); spin_lock_init(&ar->arLock);
/* Don't install the init function if BMI is requested */ dev->netdev_ops = &ar6000_netdev_ops;
if(!bmienable)
{
dev->init = ar6000_init;
} else {
AR_DEBUG_PRINTF(" BMI enabled \n");
}
dev->open = &ar6000_open;
dev->stop = &ar6000_close;
dev->hard_start_xmit = &ar6000_data_tx;
dev->get_stats = &ar6000_get_stats;
/* dev->tx_timeout = ar6000_tx_timeout; */
dev->do_ioctl = &ar6000_ioctl;
dev->watchdog_timeo = AR6000_TX_TIMEOUT; dev->watchdog_timeo = AR6000_TX_TIMEOUT;
ar6000_ioctl_iwsetup(&ath_iw_handler_def); ar6000_ioctl_iwsetup(&ath_iw_handler_def);
dev->wireless_handlers = &ath_iw_handler_def; dev->wireless_handlers = &ath_iw_handler_def;

10
target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ioctl.c
View file

@ -25,7 +25,6 @@ extern USER_RSSI_THOLD rssi_map[12];
extern unsigned int wmitimeout; extern unsigned int wmitimeout;
extern A_WAITQUEUE_HEAD arEvent; extern A_WAITQUEUE_HEAD arEvent;
extern int tspecCompliance; extern int tspecCompliance;
extern int bmienable;
extern int bypasswmi; extern int bypasswmi;
static int static int
@ -1061,14 +1060,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
#endif /* CONFIG_HOST_TCMD_SUPPORT */ #endif /* CONFIG_HOST_TCMD_SUPPORT */
case AR6000_XIOCTL_BMI_DONE: case AR6000_XIOCTL_BMI_DONE:
if(bmienable) ret = BMIDone(hifDevice);
{
ret = ar6000_init(dev);
}
else
{
ret = BMIDone(hifDevice);
}
break; break;
case AR6000_XIOCTL_BMI_READ_MEMORY: case AR6000_XIOCTL_BMI_READ_MEMORY: