diff options
-rw-r--r-- | drivers/net/wireless/atmel.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index f48a6e729224..587869d86eee 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -1593,7 +1593,6 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT | |||
1593 | dev->set_mac_address = atmel_set_mac_address; | 1593 | dev->set_mac_address = atmel_set_mac_address; |
1594 | dev->hard_start_xmit = start_tx; | 1594 | dev->hard_start_xmit = start_tx; |
1595 | dev->get_stats = atmel_get_stats; | 1595 | dev->get_stats = atmel_get_stats; |
1596 | dev->get_wireless_stats = atmel_get_wireless_stats; | ||
1597 | dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def; | 1596 | dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def; |
1598 | dev->do_ioctl = atmel_ioctl; | 1597 | dev->do_ioctl = atmel_ioctl; |
1599 | dev->irq = irq; | 1598 | dev->irq = irq; |
@@ -2411,7 +2410,8 @@ static const struct iw_handler_def atmel_handler_def = | |||
2411 | .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), | 2410 | .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), |
2412 | .standard = (iw_handler *) atmel_handler, | 2411 | .standard = (iw_handler *) atmel_handler, |
2413 | .private = (iw_handler *) atmel_private_handler, | 2412 | .private = (iw_handler *) atmel_private_handler, |
2414 | .private_args = (struct iw_priv_args *) atmel_private_args | 2413 | .private_args = (struct iw_priv_args *) atmel_private_args, |
2414 | .get_wireless_stats = atmel_get_wireless_stats | ||
2415 | }; | 2415 | }; |
2416 | 2416 | ||
2417 | static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | 2417 | static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) |
@@ -2424,19 +2424,6 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
2424 | char domain[REGDOMAINSZ+1]; | 2424 | char domain[REGDOMAINSZ+1]; |
2425 | 2425 | ||
2426 | switch (cmd) { | 2426 | switch (cmd) { |
2427 | case SIOCGIWPRIV: | ||
2428 | if(wrq->u.data.pointer) { | ||
2429 | /* Set the number of ioctl available */ | ||
2430 | wrq->u.data.length = sizeof(atmel_private_args) / sizeof(atmel_private_args[0]); | ||
2431 | |||
2432 | /* Copy structure to the user buffer */ | ||
2433 | if (copy_to_user(wrq->u.data.pointer, | ||
2434 | (u_char *) atmel_private_args, | ||
2435 | sizeof(atmel_private_args))) | ||
2436 | rc = -EFAULT; | ||
2437 | } | ||
2438 | break; | ||
2439 | |||
2440 | case ATMELIDIFC: | 2427 | case ATMELIDIFC: |
2441 | wrq->u.param.value = ATMELMAGIC; | 2428 | wrq->u.param.value = ATMELMAGIC; |
2442 | break; | 2429 | break; |