From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:45441 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252Ab1GESQw (ORCPT ); Tue, 5 Jul 2011 14:16:52 -0400 Date: Tue, 5 Jul 2011 14:08:32 -0400 From: "John W. Linville" To: Jean Delvare Cc: linux-wireless@vger.kernel.org Subject: Re: [PATCH] ipw2100: Fix command list for debugging Message-ID: <20110705180832.GA7540@tuxdriver.com> (sfid-20110705_201707_924010_8F29E1E8) References: <20110704145346.384a462a@endymion.delvare> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20110704145346.384a462a@endymion.delvare> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, Jul 04, 2011 at 02:53:46PM +0200, Jean Delvare wrote: > A missing comma in the array causes an off-by-one for later commands. > > Signed-off-by: Jean Delvare > Cc: "John W. Linville" > --- > Note: I don't have the documentation and I don't have the hardware, so > an expert should double-check this one. > > drivers/net/wireless/ipw2x00/ipw2100.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- linux-3.0-rc5.orig/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-20 10:42:41.000000000 +0200 > +++ linux-3.0-rc5/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-04 14:44:22.000000000 +0200 > @@ -287,7 +287,8 @@ static const char *command_types[] = { > "unused", /* HOST_INTERRUPT_COALESCING */ > "undefined", > "CARD_DISABLE_PHY_OFF", > - "MSDU_TX_RATES" "undefined", > + "MSDU_TX_RATES", > + "undefined", > "undefined", > "SET_STATION_STAT_BITS", > "CLEAR_STATIONS_STAT_BITS", This code dates from 2005: commit ee8e365aa6395e721399127ccf3d28d269136f0e Author: James Ketrenos Date: Wed Sep 14 09:47:29 2005 -0500 Ran scripts/Lindent on drivers/net/wireless/ipw2{1,2}00.{c,h} No other changes. Signed-off-by: James Ketrenos Prior to that, those two strings were on two different lines but with no comma betwen them -- so effectively the same as now. Changing it as you suggest would change the offsets in the array of the following string pointers, which I suspect will break the debugging code that uses it. I would rather not take this change. OTOH, perhaps you could submit a patch that simply remove the second quoted string from the single line? John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.