Commit 8e3ffa47 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville

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: default avatarDan Williams <dcbw@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 95b48c2c
...@@ -811,6 +811,10 @@ static const struct net_device_ops islpci_netdev_ops = { ...@@ -811,6 +811,10 @@ static const struct net_device_ops islpci_netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static struct device_type wlan_type = {
.name = "wlan",
};
struct net_device * struct net_device *
islpci_setup(struct pci_dev *pdev) islpci_setup(struct pci_dev *pdev)
{ {
...@@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev) ...@@ -821,9 +825,8 @@ islpci_setup(struct pci_dev *pdev)
return ndev; return ndev;
pci_set_drvdata(pdev, ndev); pci_set_drvdata(pdev, ndev);
#if defined(SET_NETDEV_DEV)
SET_NETDEV_DEV(ndev, &pdev->dev); SET_NETDEV_DEV(ndev, &pdev->dev);
#endif SET_NETDEV_DEVTYPE(ndev, &wlan_type);
/* setup the structure members */ /* setup the structure members */
ndev->base_addr = pci_resource_start(pdev, 0); ndev->base_addr = pci_resource_start(pdev, 0);
......
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