From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269AbcFJOhh (ORCPT ); Fri, 10 Jun 2016 10:37:37 -0400 Received: from lists.s-osg.org ([54.187.51.154]:44654 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbcFJOhf (ORCPT ); Fri, 10 Jun 2016 10:37:35 -0400 Subject: Re: [PATCH v2 2/3] mwifiex: move .get_tx_power logic to station ioctl file To: Kalle Valo References: <1465232558-31678-1-git-send-email-javier@osg.samsung.com> <1465232558-31678-3-git-send-email-javier@osg.samsung.com> <87wplxdsln.fsf@kamboji.qca.qualcomm.com> From: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, Julian Calaby , Shengzhen Li , Enric Balletbo i Serra , Amitkumar Karwar , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Nishant Sarmukadam Message-ID: <12ccd90e-e3eb-ecac-b23f-8124b0db32ad@osg.samsung.com> Date: Fri, 10 Jun 2016 10:37:24 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <87wplxdsln.fsf@kamboji.qca.qualcomm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Kalle, On 06/10/2016 10:30 AM, Kalle Valo wrote: > Javier Martinez Canillas writes: > >> From: Shengzhen Li >> >> Most cfg80211 operations are just a wrappers to functions defined in the >> sta_ioctl.c file, so for consistency move the .get_tx_power logic there. >> >> Signed-off-by: Shengzhen Li >> Signed-off-by: Amitkumar Karwar >> [javier: update the subject line and commit message] >> Signed-off-by: Javier Martinez Canillas > > [...] > >> --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c >> +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c >> @@ -385,18 +385,10 @@ mwifiex_cfg80211_get_tx_power(struct wiphy *wiphy, >> int *dbm) >> { >> struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); >> - struct mwifiex_private *priv = mwifiex_get_priv(adapter, >> - MWIFIEX_BSS_ROLE_ANY); >> - int ret = mwifiex_send_cmd(priv, HostCmd_CMD_RF_TX_PWR, >> - HostCmd_ACT_GEN_GET, 0, NULL, true); >> - >> - if (ret < 0) >> - return ret; >> - >> - /* tx_power_level is set in HostCmd_CMD_RF_TX_PWR command handler */ >> - *dbm = priv->tx_power_level; >> + struct mwifiex_private *priv; >> >> - return 0; >> + priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY); >> + return mwifiex_get_tx_power(priv, dbm); >> } > > So in patch 1 you added the patch and in patch 2 you move it to a > different location? That doesn't make any sense, can't you just fold the > two patches into one so that the function is added only once. > I posted this patch in v1 but then Amitkumar shared his patch with me that was very similar to mine, only that the logic was in a different location. So I included his delta as a separate patch to try keeping attribution as best as possible. Best regards, -- Javier Martinez Canillas Open Source Group Samsung Research America