From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933178AbdBPS12 (ORCPT ); Thu, 16 Feb 2017 13:27:28 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:58578 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932302AbdBPS10 (ORCPT ); Thu, 16 Feb 2017 13:27:26 -0500 Date: Thu, 16 Feb 2017 10:27:24 -0800 From: Greg Kroah-Hartman To: Maksymilian Piechota Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 1/2] staging: wlan-ng: move else if statement to a single line Message-ID: <20170216182724.GA30686@kroah.com> References: <7cc81509110c581229367b07e049a959413e9bb2.1487170789.git.maksymilianpiechota@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7cc81509110c581229367b07e049a959413e9bb2.1487170789.git.maksymilianpiechota@gmail.com> User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 15, 2017 at 10:11:00AM -0500, Maksymilian Piechota wrote: > move else if statement to a single line > > Signed-off-by: Maksymilian Piechota > --- > drivers/staging/wlan-ng/prism2mgmt.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c > index 16fb2d3..a45ff00 100644 > --- a/drivers/staging/wlan-ng/prism2mgmt.c > +++ b/drivers/staging/wlan-ng/prism2mgmt.c > @@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) > && (msg->prismheader.data == P80211ENUM_truth_true)) { > hw->sniffhdr = 0; > wlandev->netdev->type = ARPHRD_IEEE80211_PRISM; > - } else > - if ((msg->wlanheader.status == > + } else if ((msg->wlanheader.status == > P80211ENUM_msgitem_status_data_ok) > && (msg->wlanheader.data == P80211ENUM_truth_true)) { > hw->sniffhdr = 1; This patch does not apply to my tree at all :( Please rebase and resend the series. thanks, greg k-h