From patchwork Thu Jan 15 21:48:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 429589 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 F3E5214014D for ; Fri, 16 Jan 2015 08:54:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753869AbbAOVy0 (ORCPT ); Thu, 15 Jan 2015 16:54:26 -0500 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]:52652 "HELO na3sys009aog122.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753810AbbAOVyZ (ORCPT ); Thu, 15 Jan 2015 16:54:25 -0500 X-Greylist: delayed 342 seconds by postgrey-1.27 at vger.kernel.org; Thu, 15 Jan 2015 16:54:25 EST Received: from mail-pa0-f52.google.com ([209.85.220.52]) (using TLSv1) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP ID DSNKVLg3EG/9KfynwbF5PcTC9r/oVvl7K9oA@postini.com; Thu, 15 Jan 2015 13:54:25 PST Received: by mail-pa0-f52.google.com with SMTP id eu11so19928632pac.11 for ; Thu, 15 Jan 2015 13:54:24 -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=3sBBn8ktmcOMiEhZi8Thqje7EhJ1nBj3XdvWy3575ZQ=; b=BzNXAZWTHPpXR+flf6EKkudyDMVFOAU5XmW5WHCt7EIJD+t0S+D1KnbPTeXkF7yomZ wupS6htoYwpHmBaACf0Lu0DOMrqfFkw3DZ+lpV2sthQ9TEKDN6Owied8lnrZrRxSUPkz FU4RAUD1bfeaUvaIAbrPbJzRgTn6Zg/FQDKD/GCrT4F2dNuCFbtm/qr0VmBYcnQihsCo OWTw4HdwA4vv94vz2ItffNLhgCVeDohnBMwC4H2dr4jb5kJgY5SFK5wTAheLdA8WTNh9 SbWqqcyyjjniVQ3N4AVQiK7Bo1mMSULRtFf7L5KrgpWbFKhfekEqpDE7z/F+fopj7kqB NhNA== X-Received: by 10.68.163.196 with SMTP id yk4mr17241624pbb.143.1421358526393; Thu, 15 Jan 2015 13:48:46 -0800 (PST) X-Gm-Message-State: ALoCoQmeaZ82tn4QVSSMse62U/xtbT9TWvcCyX8JWeM9jjd7I+Gxj2CS8yViCX4LzZ8xL0eypgkcpb8bqoiAiPGLOyNHU3aZO7ol6Xh6FZ6BgAo0chnHNLjB9FegejuAmrV5VvngPTRwnYLiYXGHDTmLsE904/oVdw== X-Received: by 10.68.163.196 with SMTP id yk4mr17241614pbb.143.1421358526323; Thu, 15 Jan 2015 13:48:46 -0800 (PST) Received: from htb-1n-eng-dhcp192.localdomain ([208.91.2.4]) by mx.google.com with ESMTPSA id kr10sm2283788pdb.42.2015.01.15.13.48.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2015 13:48:45 -0800 (PST) From: Joe Stringer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dev@openvswitch.org, pshelar@nicira.com Subject: [PATCH net-next v12 2/5] openvswitch: Refactor ovs_flow_tbl_insert(). Date: Thu, 15 Jan 2015 13:48:24 -0800 Message-Id: <1421358507-5992-3-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1421358507-5992-1-git-send-email-joestringer@nicira.com> References: <1421358507-5992-1-git-send-email-joestringer@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rework so that ovs_flow_tbl_insert() calls flow_{key,mask}_insert(). This tidies up a future patch. Signed-off-by: Joe Stringer --- net/openvswitch/flow_table.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 5899bf1..81b977d 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -585,16 +585,10 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, } /* Must be called with OVS mutex held. */ -int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, - const struct sw_flow_mask *mask) +static void flow_key_insert(struct flow_table *table, struct sw_flow *flow) { struct table_instance *new_ti = NULL; struct table_instance *ti; - int err; - - err = flow_mask_insert(table, flow, mask); - if (err) - return err; flow->hash = flow_hash(&flow->key, flow->mask->range.start, flow->mask->range.end); @@ -613,6 +607,19 @@ int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, table_instance_destroy(ti, true); table->last_rehash = jiffies; } +} + +/* Must be called with OVS mutex held. */ +int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, + const struct sw_flow_mask *mask) +{ + int err; + + err = flow_mask_insert(table, flow, mask); + if (err) + return err; + flow_key_insert(table, flow); + return 0; }