Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 16:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

hso: fix rfkill name conflicts

Browse Source 
By using only the usb interface number for the rfkill name, we might
have a name conflicts in case two similar hso devices are connected.

In this patch, the name of the hso rfkill interface embed the value
of a counter that is incremented each time a new rfkill interface is
added.

Suggested-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Olivier Sobrie 2015-01-30 13:22:03 +01:00 committed by David S. Miller
parent cc491970f5
commit 38121067b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/usb/hso.c
View File

@ -153,7 +153,7 @@ struct hso_net {
struct hso_device *parent; struct hso_device *parent;
struct net_device *net; struct net_device *net;
struct rfkill *rfkill; struct rfkill *rfkill;
char name[8]; char name[24];
struct usb_endpoint_descriptor *in_endp; struct usb_endpoint_descriptor *in_endp;
struct usb_endpoint_descriptor *out_endp; struct usb_endpoint_descriptor *out_endp;
@ -2469,9 +2469,10 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
{ {
struct hso_net *hso_net = dev2net(hso_dev); struct hso_net *hso_net = dev2net(hso_dev);
struct device *dev = &hso_net->net->dev; struct device *dev = &hso_net->net->dev;
static u32 rfkill_counter;
snprintf(hso_net->name, sizeof(hso_net->name), "hso-%d", snprintf(hso_net->name, sizeof(hso_net->name), "hso-%d",
interface->altsetting->desc.bInterfaceNumber); rfkill_counter++);
hso_net->rfkill = rfkill_alloc(hso_net->name, hso_net->rfkill = rfkill_alloc(hso_net->name,
&interface_to_usbdev(interface)->dev, &interface_to_usbdev(interface)->dev,