Changeset 16959


Ignore:
Timestamp:
2009-07-22T23:34:11+02:00 (7 years ago)
Author:
lars
Message:

[s3c24xx] ar6000: use net_device_ops

Location:
trunk/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ar6000_drv.c

    r16668 r16959  
    4949#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */ 
    5050 
    51 int bmienable = 0; 
    5251unsigned int bypasswmi = 0; 
    5352unsigned int debuglevel = 0; 
     
    6968 
    7069#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 
    71 module_param(bmienable, int, 0644); 
    7270module_param(bypasswmi, int, 0644); 
    7371module_param(debuglevel, int, 0644); 
     
    9189#define __user 
    9290/* for linux 2.4 and lower */ 
    93 MODULE_PARM(bmienable,"i"); 
    9491MODULE_PARM(bypasswmi,"i"); 
    9592MODULE_PARM(debuglevel, "i"); 
     
    702699} 
    703700 
     701static const struct net_device_ops ar6000_netdev_ops = { 
     702    .ndo_init = &ar6000_init, 
     703    .ndo_open = &ar6000_open, 
     704    .ndo_stop = &ar6000_close, 
     705    .ndo_start_xmit = &ar6000_data_tx, 
     706    .ndo_get_stats = &ar6000_get_stats, 
     707    .ndo_do_ioctl = &ar6000_ioctl, 
     708}; 
    704709/* 
    705710 * HTC Event handlers 
     
    859864    spin_lock_init(&ar->arLock); 
    860865 
    861     /* Don't install the init function if BMI is requested */ 
    862     if(!bmienable) 
    863     { 
    864         dev->init = ar6000_init; 
    865     } else { 
    866         AR_DEBUG_PRINTF(" BMI enabled \n"); 
    867     } 
    868  
    869     dev->open = &ar6000_open; 
    870     dev->stop = &ar6000_close; 
    871     dev->hard_start_xmit = &ar6000_data_tx; 
    872     dev->get_stats = &ar6000_get_stats; 
    873  
    874     /* dev->tx_timeout = ar6000_tx_timeout; */ 
    875     dev->do_ioctl = &ar6000_ioctl; 
     866    dev->netdev_ops = &ar6000_netdev_ops; 
    876867    dev->watchdog_timeo = AR6000_TX_TIMEOUT; 
    877868    ar6000_ioctl_iwsetup(&ath_iw_handler_def); 
  • trunk/target/linux/s3c24xx/files-2.6.30/drivers/ar6000/ar6000/ioctl.c

    r15918 r16959  
    2626extern A_WAITQUEUE_HEAD arEvent; 
    2727extern int tspecCompliance; 
    28 extern int bmienable; 
    2928extern int bypasswmi; 
    3029 
     
    10621061 
    10631062        case AR6000_XIOCTL_BMI_DONE: 
    1064             if(bmienable) 
    1065             { 
    1066                 ret = ar6000_init(dev); 
    1067             } 
    1068             else 
    1069             { 
    1070                 ret = BMIDone(hifDevice); 
    1071             } 
     1063            ret = BMIDone(hifDevice); 
    10721064            break; 
    10731065 
Note: See TracChangeset for help on using the changeset viewer.