diff options
author | Jean Tourrilhes <jt@hpl.hp.com> | 2005-09-02 14:42:56 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-06 22:44:23 -0400 |
commit | 61bd49631474c8763676a6ac72461cb523ddb78a (patch) | |
tree | 05f2066fcde0558d2a4cd8c93260a8b7eed97a88 /drivers/net/wireless | |
parent | 00b309f561e9746fd6ac9598c4203c6610fcb26c (diff) |
[PATCH] prism54 : WE-17 support
My patch that adds WE-17 support to the Prism54 driver went
already in the kernel, except for a tiny bit that was dropped on the
way. This is the missing bit....
Tested with 2.6.13 (with real HW).
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 0f29a9c7bc2c..9a8790e3580c 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -2727,6 +2727,9 @@ const struct iw_handler_def prism54_handler_def = { | |||
2727 | .standard = (iw_handler *) prism54_handler, | 2727 | .standard = (iw_handler *) prism54_handler, |
2728 | .private = (iw_handler *) prism54_private_handler, | 2728 | .private = (iw_handler *) prism54_private_handler, |
2729 | .private_args = (struct iw_priv_args *) prism54_private_args, | 2729 | .private_args = (struct iw_priv_args *) prism54_private_args, |
2730 | #if WIRELESS_EXT > 16 | ||
2731 | .get_wireless_stats = prism54_get_wireless_stats, | ||
2732 | #endif /* WIRELESS_EXT > 16 */ | ||
2730 | #if WIRELESS_EXT == 16 | 2733 | #if WIRELESS_EXT == 16 |
2731 | .spy_offset = offsetof(islpci_private, spy_data), | 2734 | .spy_offset = offsetof(islpci_private, spy_data), |
2732 | #endif /* WIRELESS_EXT == 16 */ | 2735 | #endif /* WIRELESS_EXT == 16 */ |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index efab07e9e24e..6f13d4a8e2d3 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -815,7 +815,6 @@ islpci_setup(struct pci_dev *pdev) | |||
815 | ndev->open = &islpci_open; | 815 | ndev->open = &islpci_open; |
816 | ndev->stop = &islpci_close; | 816 | ndev->stop = &islpci_close; |
817 | ndev->get_stats = &islpci_statistics; | 817 | ndev->get_stats = &islpci_statistics; |
818 | ndev->get_wireless_stats = &prism54_get_wireless_stats; | ||
819 | ndev->do_ioctl = &prism54_ioctl; | 818 | ndev->do_ioctl = &prism54_ioctl; |
820 | ndev->wireless_handlers = | 819 | ndev->wireless_handlers = |
821 | (struct iw_handler_def *) &prism54_handler_def; | 820 | (struct iw_handler_def *) &prism54_handler_def; |
@@ -844,6 +843,8 @@ islpci_setup(struct pci_dev *pdev) | |||
844 | /* Add pointers to enable iwspy support. */ | 843 | /* Add pointers to enable iwspy support. */ |
845 | priv->wireless_data.spy_data = &priv->spy_data; | 844 | priv->wireless_data.spy_data = &priv->spy_data; |
846 | ndev->wireless_data = &priv->wireless_data; | 845 | ndev->wireless_data = &priv->wireless_data; |
846 | #else /* WIRELESS_EXT > 16 */ | ||
847 | ndev->get_wireless_stats = &prism54_get_wireless_stats; | ||
847 | #endif /* WIRELESS_EXT > 16 */ | 848 | #endif /* WIRELESS_EXT > 16 */ |
848 | 849 | ||
849 | /* save the start and end address of the PCI memory area */ | 850 | /* save the start and end address of the PCI memory area */ |