lkml.org 
[lkml]   [2013]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 43/60] prism54: set netdev type to "wlan"
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Williams <dcbw@redhat.com>

    commit 8e3ffa471091c560deb6738ed9ab7445b7a5fd04 upstream.

    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>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/prism54/islpci_dev.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- 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 islpc
    .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);



    \
     
     \ /
      Last update: 2013-12-03 00:21    [W:5.959 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site