Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7579
b: refs/heads/master
c: 61bd496
h: refs/heads/master
i:
  7577: e4f3218
  7575: ddd396a
v: v3
  • Loading branch information
Jean Tourrilhes authored and Jeff Garzik committed Sep 7, 2005
1 parent 472d05e commit 1bc4dc8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00b309f561e9746fd6ac9598c4203c6610fcb26c
refs/heads/master: 61bd49631474c8763676a6ac72461cb523ddb78a
3 changes: 3 additions & 0 deletions trunk/drivers/net/wireless/prism54/isl_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2727,6 +2727,9 @@ const struct iw_handler_def prism54_handler_def = {
.standard = (iw_handler *) prism54_handler,
.private = (iw_handler *) prism54_private_handler,
.private_args = (struct iw_priv_args *) prism54_private_args,
#if WIRELESS_EXT > 16
.get_wireless_stats = prism54_get_wireless_stats,
#endif /* WIRELESS_EXT > 16 */
#if WIRELESS_EXT == 16
.spy_offset = offsetof(islpci_private, spy_data),
#endif /* WIRELESS_EXT == 16 */
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/net/wireless/prism54/islpci_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,6 @@ islpci_setup(struct pci_dev *pdev)
ndev->open = &islpci_open;
ndev->stop = &islpci_close;
ndev->get_stats = &islpci_statistics;
ndev->get_wireless_stats = &prism54_get_wireless_stats;
ndev->do_ioctl = &prism54_ioctl;
ndev->wireless_handlers =
(struct iw_handler_def *) &prism54_handler_def;
Expand Down Expand Up @@ -844,6 +843,8 @@ islpci_setup(struct pci_dev *pdev)
/* Add pointers to enable iwspy support. */
priv->wireless_data.spy_data = &priv->spy_data;
ndev->wireless_data = &priv->wireless_data;
#else /* WIRELESS_EXT > 16 */
ndev->get_wireless_stats = &prism54_get_wireless_stats;
#endif /* WIRELESS_EXT > 16 */

/* save the start and end address of the PCI memory area */
Expand Down

0 comments on commit 1bc4dc8

Please sign in to comment.