aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Trimarchi <trimarchi@gandalf.sssup.it>2009-09-22 19:36:37 +0200
committerNelson Castillo <arhuaco@freaks-unidos.net>2009-09-22 22:55:17 -0500
commit54f6fd272bec8e57f1040fc0fa1d954051fc275c (patch)
treee32c746d3f7a23f6f6f6101e51fd798214cc14f6
parenta3587e4ed77974adfb057af261aaeea4022018e8 (diff)
Remove dependence on old netdev operations
Remove the dependence to the OLD NET DEV operation Signed-off-by: Michael Trimarchi <michael@panicking.kicks-ass.org>
-rw-r--r--drivers/ar6000/ar6000/ar6000_drv.c20
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;