diff options
| author |   Dan Williams <dcbw@redhat.com> | 2013-11-08 13:39:44 -0600 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2013-11-11 14:47:46 -0500 |
| commit | 8e3ffa471091c560deb6738ed9ab7445b7a5fd04 (patch) | |
| tree | 9a09fd1d73ee1ce51b644a04519539b367dbdec5 | |
| parent | wcn36xx: missing unlocks on error paths (diff) | |
| download | linux-dev-8e3ffa471091c560deb6738ed9ab7445b7a5fd04.tar.xz linux-dev-8e3ffa471091c560deb6738ed9ab7445b7a5fd04.zip | |
prism54: set netdev type to "wlan"
Userspace uses the netdev devtype for stuff like device naming and type
detection. Be nice and set it. Remove the pointless #if/#endif around
SET_NETDEV_DEV too.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 41a16d30c79c..e05d9b4c8317 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -811,6 +811,10 @@ static const struct net_device_ops islpci_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +static struct device_type wlan_type = { + .name = "wlan", +}; + struct net_device * islpci_setup(struct pci_dev *pdev) { @@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev) return ndev; pci_set_drvdata(pdev, ndev); -#if defined(SET_NETDEV_DEV) SET_NETDEV_DEV(ndev, &pdev->dev); -#endif + SET_NETDEV_DEVTYPE(ndev, &wlan_type); /* setup the structure members */ ndev->base_addr = pci_resource_start(pdev, 0); |