aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2013-12-24 11:22:54 -0600
committerBen Hutchings <ben@decadent.org.uk>2014-04-02 00:58:42 +0100
commit900a2253be2a79bec23e572fa84b1a8844e497c4 (patch)
tree3b8c3dbb9e5aac6d2637279b116bc13937f84a54 /drivers/staging
parent3d42de37001784d4e00c2e2cd6e4fdb983a76e21 (diff)
downloadkernel_samsung_smdk4412-900a2253be2a79bec23e572fa84b1a8844e497c4.zip
kernel_samsung_smdk4412-900a2253be2a79bec23e572fa84b1a8844e497c4.tar.gz
kernel_samsung_smdk4412-900a2253be2a79bec23e572fa84b1a8844e497c4.tar.bz2
staging: r8712u: Set device type to wlan
commit 3a21f00a5002b14e4aab52aef59d33ed28468a13 upstream. The latest version of NetworkManager does not recognize the device as wireless without this change. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8712/usb_intf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 88d1d35..a74e83d 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -363,6 +363,10 @@ static u8 key_2char2num(u8 hch, u8 lch)
return (hex_to_bin(hch) << 4) | hex_to_bin(lch);
}
+static const struct device_type wlan_type = {
+ .name = "wlan",
+};
+
/*
* drv_init() - a device potentially for us
*
@@ -398,6 +402,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
padapter->pusb_intf = pusb_intf;
usb_set_intfdata(pusb_intf, pnetdev);
SET_NETDEV_DEV(pnetdev, &pusb_intf->dev);
+ pnetdev->dev.type = &wlan_type;
/* step 2. */
padapter->dvobj_init = &r8712_usb_dvobj_init;
padapter->dvobj_deinit = &r8712_usb_dvobj_deinit;