From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751946AbdBFRzR (ORCPT ); Mon, 6 Feb 2017 12:55:17 -0500 Received: from smtprelay0177.hostedemail.com ([216.40.44.177]:50728 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751321AbdBFRzQ (ORCPT ); Mon, 6 Feb 2017 12:55:16 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:355:379:541:599:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3352:3622:3865:3867:3873:4321:4823:5007:10004:10400:10848:11026:11473:11658:11914:12043:12438:12555:12740:12760:12895:13069:13071:13311:13357:13439:14096:14097:14180:14181:14659:14721:14877:21060:21080:30046:30054:30070:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: milk35_67d4b8141d540 X-Filterd-Recvd-Size: 2014 Message-ID: <1486403712.3616.17.camel@perches.com> Subject: Re: [PATCH v4 2/2] staging: lustre: move else if statement to a single line From: Joe Perches To: Maksymilian Piechota , Greg Kroah-Hartman Cc: maksymilian.piechota@gmail.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Date: Mon, 06 Feb 2017 09:55:12 -0800 In-Reply-To: References: Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.22.3-0ubuntu0.1 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 Mon, 2017-02-06 at 11:13 -0500, Maksymilian Piechota wrote: > diff --git 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 == P80211ENUM_msgitem_status_data_ok) && > + } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && > (msg->wlanheader.data == P80211ENUM_truth_true)) { > hw->sniffhdr = 1; > wlandev->netdev->type = ARPHRD_IEEE80211_PRISM; Hi again. When you change the else if on multiple lines to a single line, you should also realign the continuation like: } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && (msg->wlanheader.data == P80211ENUM_truth_true)) { Using 3 tabs then 3 spaces