Return-path: Received: from mail-we0-f180.google.com ([74.125.82.180]:42803 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920Ab3FXRm4 convert rfc822-to-8bit (ORCPT ); Mon, 24 Jun 2013 13:42:56 -0400 Received: by mail-we0-f180.google.com with SMTP id w56so8550122wes.11 for ; Mon, 24 Jun 2013 10:42:55 -0700 (PDT) References: <1371915734-13966-1-git-send-email-juhosg@openwrt.org> <1371915734-13966-4-git-send-email-juhosg@openwrt.org> Mime-Version: 1.0 (1.0) In-Reply-To: <1371915734-13966-4-git-send-email-juhosg@openwrt.org> Content-Type: text/plain; charset=us-ascii Message-Id: <3B42FB1E-C6CE-4580-9C71-47BB609B4CB8@gmail.com> (sfid-20130624_194300_524149_771CDCAF) Cc: John Linville , "linux-wireless@vger.kernel.org" , "users@rt2x00.serialmonkey.com" , Gabor Juhos From: Gertjan van Wingerde Subject: Re: [PATCH 3/3] rt2x00: rt2800lib: turn on tertiary PAs/LNAs for 3T/3R devices Date: Mon, 24 Jun 2013 19:42:51 +0200 To: Gabor Juhos Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi Gabor, Sent from my iPad On 22 jun. 2013, at 17:42, Gabor Juhos wrote: > Signed-off-by: Gabor Juhos > --- > drivers/net/wireless/rt2x00/rt2800lib.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c > index f4cd3d8..664e9e1 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -2684,12 +2684,26 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, > rf->channel > 14); > rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN, > rf->channel <= 14); > + > + if (rt2x00dev->default_ant.tx_chain_num > 2) { > + /* Turn on tertiary PAs for 3T devices */ > + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A2_EN, > + rf->channel > 14); > + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G2_EN, > + rf->channel <= 14); > + } > } > > if (rt2x00dev->default_ant.rx_chain_num > 1) { > /* Turn on secondary LNAs for 2R and for 3R devices */ > rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1); > rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1); > + > + if (rt2x00dev->default_ant.rx_chain_num > 2) { > + /* Turn on tertiary LNAs for 3R devices */ > + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, 1); > + rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, 1); > + } > } Stylistic I would prefer the if outside of if block you included it in. Something like: if (tx_chain_num > 2) { /* Turn on tertiary PAs for 3T devices */ } if (tx_chain_num > 1) { /* Turn on secondary PAs for 2T and for 3T devices */ } /* Turn on primary PAs for 1T, 2T and for 3T devices */ At least to me this is easier to read. Alternatively it could be changed to a switch statement wit fall-through cases for the number of RX/TX streams. > > rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1); > -- > 1.7.10 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html