Skip to content

Commit

Permalink
prism54: set netdev type to "wlan"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams authored and John W. Linville committed Nov 11, 2013
1 parent 95b48c2 commit 8e3ffa4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/wireless/prism54/islpci_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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);
Expand Down

0 comments on commit 8e3ffa4

Please sign in to comment.