Commit 7a716536 authored by Pavel Roskin's avatar Pavel Roskin Committed by Jeff Garzik

[PATCH] hostap: Fix pci_driver name for hostap_plx and hostap_pci

hostap_pci and hostap_plx drivers still use PCI driver names
"prism2_pci" and "prism2_plx" respectively.  This is unfriendly to
linux-wlan-ng, which uses the same names.  So, if e.g. hostap_pci and
prism2_pci are loaded, they will "share" /sys/bus/pci/drivers/prism2_plx
directory.

Change PCI driver names of hostap_pci and hostap_plx to be equal to
their module names.
Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 8cee0cd5
...@@ -441,7 +441,7 @@ static int prism2_pci_resume(struct pci_dev *pdev) ...@@ -441,7 +441,7 @@ static int prism2_pci_resume(struct pci_dev *pdev)
MODULE_DEVICE_TABLE(pci, prism2_pci_id_table); MODULE_DEVICE_TABLE(pci, prism2_pci_id_table);
static struct pci_driver prism2_pci_drv_id = { static struct pci_driver prism2_pci_drv_id = {
.name = "prism2_pci", .name = "hostap_pci",
.id_table = prism2_pci_id_table, .id_table = prism2_pci_id_table,
.probe = prism2_pci_probe, .probe = prism2_pci_probe,
.remove = prism2_pci_remove, .remove = prism2_pci_remove,
......
...@@ -616,7 +616,7 @@ static void prism2_plx_remove(struct pci_dev *pdev) ...@@ -616,7 +616,7 @@ static void prism2_plx_remove(struct pci_dev *pdev)
MODULE_DEVICE_TABLE(pci, prism2_plx_id_table); MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
static struct pci_driver prism2_plx_drv_id = { static struct pci_driver prism2_plx_drv_id = {
.name = "prism2_plx", .name = "hostap_plx",
.id_table = prism2_plx_id_table, .id_table = prism2_plx_id_table,
.probe = prism2_plx_probe, .probe = prism2_plx_probe,
.remove = prism2_plx_remove, .remove = prism2_plx_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment