From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932674AbbA3PsJ (ORCPT ); Fri, 30 Jan 2015 10:48:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36950 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042AbbA3PsH (ORCPT ); Fri, 30 Jan 2015 10:48:07 -0500 Message-ID: <1422632879.30854.0.camel@dcbw.local> Subject: Re: [PATCH v2 11/11] hso: fix rfkill name conflicts From: Dan Williams To: Olivier Sobrie Cc: Jan Dumon , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Date: Fri, 30 Jan 2015 09:47:59 -0600 In-Reply-To: <1422620523-15021-12-git-send-email-olivier@sobrie.be> References: <1421756978-4093-1-git-send-email-olivier@sobrie.be> <1422620523-15021-1-git-send-email-olivier@sobrie.be> <1422620523-15021-2-git-send-email-olivier@sobrie.be> <1422620523-15021-3-git-send-email-olivier@sobrie.be> <1422620523-15021-4-git-send-email-olivier@sobrie.be> <1422620523-15021-5-git-send-email-olivier@sobrie.be> <1422620523-15021-6-git-send-email-olivier@sobrie.be> <1422620523-15021-7-git-send-email-olivier@sobrie.be> <1422620523-15021-8-git-send-email-olivier@sobrie.be> <1422620523-15021-9-git-send-email-olivier@sobrie.be> <1422620523-15021-10-git-send-email-olivier@sobrie.be> <1422620523-15021-11-git-send-email-olivier@sobrie.be> <1422620523-15021-12-git-send-email-olivier@sobrie.be> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2015-01-30 at 13:22 +0100, Olivier Sobrie wrote: > 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 > Signed-off-by: Olivier Sobrie > --- > drivers/net/usb/hso.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c > index c14fc80..d31a165 100644 > --- a/drivers/net/usb/hso.c > +++ b/drivers/net/usb/hso.c > @@ -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; > @@ -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; It'll probably be initialized to 0, but still, it would feel safer with an explicit "rfkill_counter = 0"... Dan > 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,