Skip to content

Commit

Permalink
hso: fix rfkill name conflicts
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Olivier Sobrie authored and David S. Miller committed Feb 1, 2015
1 parent cc49197 commit 3812106
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/usb/hso.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ struct hso_net {
struct hso_device *parent;
struct net_device *net;
struct rfkill *rfkill;
char name[8];
char name[24];

struct usb_endpoint_descriptor *in_endp;
struct usb_endpoint_descriptor *out_endp;
Expand Down Expand Up @@ -2469,9 +2469,10 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
{
struct hso_net *hso_net = dev2net(hso_dev);
struct device *dev = &hso_net->net->dev;
static u32 rfkill_counter;

snprintf(hso_net->name, sizeof(hso_net->name), "hso-%d",
interface->altsetting->desc.bInterfaceNumber);
rfkill_counter++);

hso_net->rfkill = rfkill_alloc(hso_net->name,
&interface_to_usbdev(interface)->dev,
Expand Down

0 comments on commit 3812106

Please sign in to comment.