From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948AbbIKHbX (ORCPT ); Fri, 11 Sep 2015 03:31:23 -0400 Received: from mail-qg0-f49.google.com ([209.85.192.49]:34249 "EHLO mail-qg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751710AbbIKHbT (ORCPT ); Fri, 11 Sep 2015 03:31:19 -0400 From: =?UTF-8?q?Rapha=C3=ABl=20Beamonte?= To: Greg Kroah-Hartman Cc: Dan Carpenter , =?UTF-8?q?Rapha=C3=ABl=20Beamonte?= , Cristina Opriceana , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCHv2 04/16] staging: rtl8192u: r8192U_core: reverse conditions to get lines under 80 characters Date: Fri, 11 Sep 2015 03:29:12 -0400 Message-Id: <06213f8ebb5639959f71fa034583585a693d20a9.1441955761.git.raphael.beamonte@gmail.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reverse some conditions to clean the code and allow to have lines under 80 characters, as to follow the kernel code style. Signed-off-by: Raphaël Beamonte --- drivers/staging/rtl8192u/r8192U_core.c | 48 ++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index c8724cd..85dfcbb 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -202,18 +202,19 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) __func__); } cl = ChannelPlan[channel_plan]; - if (cl.Len != 0) { - /* Clear old channel map */ - memset(GET_DOT11D_INFO(ieee)->channel_map, 0, - sizeof(GET_DOT11D_INFO(ieee)->channel_map)); - /* Set new channel map */ - for (i = 0; i < cl.Len; i++) { - u8 chan = cl.Channel[i]; - - if (chan < min_chan || chan > max_chan) - break; - GET_DOT11D_INFO(ieee)->channel_map[chan] = 1; - } + if (cl.Len == 0) + break; + + /* Clear old channel map */ + memset(GET_DOT11D_INFO(ieee)->channel_map, 0, + sizeof(GET_DOT11D_INFO(ieee)->channel_map)); + /* Set new channel map */ + for (i = 0; i < cl.Len; i++) { + u8 chan = cl.Channel[i]; + + if (chan < min_chan || chan > max_chan) + break; + GET_DOT11D_INFO(ieee)->channel_map[chan] = 1; } break; @@ -1088,17 +1089,18 @@ static void rtl8192_tx_isr(struct urb *tx_urb) */ /* Handle MPDU in wait queue. */ - if (queue_index != BEACON_QUEUE) { - /* Don't send data frame during scanning.*/ - if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) && - (!(priv->ieee80211->queue_stop))) { - skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index])); - if (skb) - priv->ieee80211->softmac_hard_start_xmit(skb, - dev); - - return; /* avoid further processing AMSDU */ - } + if (queue_index == BEACON_QUEUE) + return; + + /* Don't send data frame during scanning.*/ + if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) && + (!(priv->ieee80211->queue_stop))) { + skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index])); + if (skb) + priv->ieee80211->softmac_hard_start_xmit(skb, + dev); + + return; /* avoid further processing AMSDU */ } } -- 2.5.1