diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
commit | 464fc937c80ec25b1ac1a8c289a40a290e830e66 (patch) | |
tree | 81442d16f5c58207274949371ea6ec5089c757d8 /drivers/ar6000/ar6000 | |
parent | cd38bcdac64aec45575ed58de66db4a2fbf1914d (diff) | |
parent | fa5743d920385c2cf344bb1a0b964af8a9511d85 (diff) |
Merge commit 'refs/remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/ar6000/ar6000')
-rw-r--r-- | drivers/ar6000/ar6000/ar6000_drv.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/ar6000/ar6000/ar6000_drv.c b/drivers/ar6000/ar6000/ar6000_drv.c index 21504f221dd..2941d5ed8c2 100644 --- a/drivers/ar6000/ar6000/ar6000_drv.c +++ b/drivers/ar6000/ar6000/ar6000_drv.c @@ -221,6 +221,15 @@ static void ar6000_detect_error(unsigned long ptr); static struct net_device_stats *ar6000_get_stats(struct net_device *dev); static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev); +static struct net_device_ops ar6000_netdev_ops = { + .ndo_open = ar6000_open, + .ndo_stop = ar6000_close, + .ndo_start_xmit = ar6000_data_tx, + .ndo_validate_addr = eth_validate_addr, + .ndo_do_ioctl = ar6000_ioctl, + .ndo_get_stats = &ar6000_get_stats, +}; + /* * HTC service connection handlers */ @@ -858,20 +867,15 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle) spin_lock_init(&ar->arLock); /* Don't install the init function if BMI is requested */ - if(!bmienable) - { - dev->init = ar6000_init; + if (!bmienable) { + ar6000_netdev_ops.ndo_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->netdev_ops = &ar6000_netdev_ops; /* dev->tx_timeout = ar6000_tx_timeout; */ - dev->do_ioctl = &ar6000_ioctl; dev->watchdog_timeo = AR6000_TX_TIMEOUT; ar6000_ioctl_iwsetup(&ath_iw_handler_def); dev->wireless_handlers = &ath_iw_handler_def; |