From patchwork Mon Dec 24 02:14:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 208002 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3957D2C0089 for ; Mon, 24 Dec 2012 13:16:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753074Ab2LXCPc (ORCPT ); Sun, 23 Dec 2012 21:15:32 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34568 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753039Ab2LXCP3 (ORCPT ); Sun, 23 Dec 2012 21:15:29 -0500 Received: by mail-pa0-f44.google.com with SMTP id hz11so3819229pad.3 for ; Sun, 23 Dec 2012 18:15:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2KY7fgx3p32Q/YnHBGI9FTijc7GNHYebV7DMELsPGfA=; b=v9c9H3qTgN8ZIUwU6TWsFAFP3mOs0ts5f8WGoTl1wm85By9HacRGvqfW6851+2IN4X NTuZmPIv8/ihrLx0n7DHngrk49/pHrGqOdZ/Izk3cwbkJXiuL6rJrETmzzS2HAHTqgd8 3jf06zqxrVQCUiIb015wDo35cc07Qe6ayIdUoBCnYiJQKWZzBoiPVEk32MKtregPenk6 Gt1hLxjTSgn1Ib4gtHcT+dJnDGswYlu+mACSr67eHgYnvFpPuGFXR4OVKuE9ucu1tO/f ikSMa6RTCV9fkDcnzqBI29YTw0q3F+b4/rqk9aQcP5YHUGu/4UI5UYxRhpY1YIxbg5Ck pzng== X-Received: by 10.68.213.202 with SMTP id nu10mr63589248pbc.91.1356315328803; Sun, 23 Dec 2012 18:15:28 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id wr4sm11379909pbc.72.2012.12.23.18.15.27 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 18:15:28 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH 27/29] net/core: remove duplicate statements by do-while loop Date: Mon, 24 Dec 2012 11:14:14 +0900 Message-Id: <1356315256-6572-28-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> References: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove duplicate statements by using do-while loop instead of while loop. - A; - while (e) { + do { A; - } + } while (e); Signed-off-by: Akinobu Mita Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- net/core/pktgen.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index d23ec86..48a3a29 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2379,18 +2379,15 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) __be32 s; if (pkt_dev->flags & F_IPDST_RND) { - t = prandom_u32() % (imx - imn) + imn; - s = htonl(t); - - while (ipv4_is_loopback(s) || - ipv4_is_multicast(s) || - ipv4_is_lbcast(s) || - ipv4_is_zeronet(s) || - ipv4_is_local_multicast(s)) { + do { t = prandom_u32() % (imx - imn) + imn; s = htonl(t); - } + } while (ipv4_is_loopback(s) || + ipv4_is_multicast(s) || + ipv4_is_lbcast(s) || + ipv4_is_zeronet(s) || + ipv4_is_local_multicast(s)); pkt_dev->cur_daddr = s; } else { t = ntohl(pkt_dev->cur_daddr);