aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-29 17:30:19 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-29 17:30:19 -0500
commite21a2b0cc5849e76434b37aff3a4b502c772f191 (patch)
tree2fad2f2025ca1d9e5bc88d4e835e07967b8fd762 /drivers/usb/net
parent8a89334caf80bb7c86383b73fd5a528cb88c696f (diff)
parent2638fed7ccb07ff43cdc109dd78e821efb629995 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/usb/net')
-rw-r--r--drivers/usb/net/zd1201.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index fe9b60cd8d9..9b1e4ed1d07 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -1736,6 +1736,7 @@ static const struct iw_handler_def zd1201_iw_handlers = {
.standard = (iw_handler *)zd1201_iw_handler,
.private = (iw_handler *)zd1201_private_handler,
.private_args = (struct iw_priv_args *) zd1201_private_args,
+ .get_wireless_stats = zd1201_get_wireless_stats,
};
static int zd1201_probe(struct usb_interface *interface,
@@ -1796,7 +1797,6 @@ static int zd1201_probe(struct usb_interface *interface,
zd->dev->open = zd1201_net_open;
zd->dev->stop = zd1201_net_stop;
zd->dev->get_stats = zd1201_get_stats;
- zd->dev->get_wireless_stats = zd1201_get_wireless_stats;
zd->dev->wireless_handlers =
(struct iw_handler_def *)&zd1201_iw_handlers;
zd->dev->hard_start_xmit = zd1201_hard_start_xmit;