From patchwork Wed Jan 27 21:31:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 574440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 4A164140E1A for ; Thu, 28 Jan 2016 08:31:32 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 83E44109C6; Wed, 27 Jan 2016 13:31:24 -0800 (PST) X-Original-To: dev@openvswitch.com Delivered-To: dev@openvswitch.com Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by archives.nicira.com (Postfix) with ESMTPS id B4F61109C2 for ; Wed, 27 Jan 2016 13:31:23 -0800 (PST) Received: by mail-pf0-f193.google.com with SMTP id x125so989212pfb.0 for ; Wed, 27 Jan 2016 13:31:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zZyKU0iT3fxidJdT0ZhSRRn95AzzzoTGX6aAtKrByI8=; b=NEyhiJZ3BskcwWntVFCoTqePxRURhUf5Ws7v4wrmgrNuhoO7yprrzrsm0p2CXOvr71 qkP2NoeeIhqlX1RQSTiyE3VrJWfVBb4PM7XPX5Q9AxSQNhQAQQ2jltTDJHGfZUSiMNwe IqECSRlbrBYuNSs3P4fTA/uDwjCHIquyKX60IebFDes6dtdjNNybNyVFBvXjr9FU+ApJ hkdLQ7JpGzDllNIwk2Tb9prRNw/1++SKju/G6QwGaWslM+fs5CdecXtqh3vc53IsTvhS dw3pJAPMaDpZdKfcRUJLIRB/cO7sqmJ0/9ZYXovhO9HzzqA9zh6GhH4FfI8TdSbDZE/B LpFg== X-Gm-Message-State: AG10YOSS6I403RGY72Mhw8uT202M4Dz2LOMpZoZMEsw6kzz/+4GOOqpIIU/nKeu+bSTDHg== X-Received: by 10.98.79.4 with SMTP id d4mr45214553pfb.46.1453930283156; Wed, 27 Jan 2016 13:31:23 -0800 (PST) Received: from ubuntu.localdomain ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id 3sm11139495pfb.64.2016.01.27.13.31.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jan 2016 13:31:21 -0800 (PST) From: Andy Zhou To: dev@openvswitch.com Date: Wed, 27 Jan 2016 13:31:04 -0800 Message-Id: <1453930264-111017-3-git-send-email-azhou@ovn.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453930264-111017-1-git-send-email-azhou@ovn.org> References: <1453930264-111017-1-git-send-email-azhou@ovn.org> Subject: [ovs-dev] [PATCH 3/3] dpif-netdev: Reduce code duplication X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Code clean up to reduce code duplication. Signed-off-by: Andy Zhou Acked-by: Daniele Di Proietto --- lib/dpif-netdev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index a7e15aa..8d72e27 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3178,13 +3178,11 @@ dp_netdev_queue_batches(struct dp_packet *pkt, { struct packet_batch *batch = flow->batch; - if (OVS_LIKELY(batch)) { - packet_batch_update(batch, pkt, mf); - return; + if (OVS_UNLIKELY(!batch)) { + batch = &batches[(*n_batches)++]; + packet_batch_init(batch, flow); } - batch = &batches[(*n_batches)++]; - packet_batch_init(batch, flow); packet_batch_update(batch, pkt, mf); }