From patchwork Sat May 9 13:10:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 470313 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 65351140218 for ; Sat, 9 May 2015 23:11:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751449AbbEINLA (ORCPT ); Sat, 9 May 2015 09:11:00 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:33725 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbbEINK5 (ORCPT ); Sat, 9 May 2015 09:10:57 -0400 Received: by wief7 with SMTP id f7so54235722wie.0 for ; Sat, 09 May 2015 06:10:56 -0700 (PDT) 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=EvodSpE3BxKNGqkGO/2DXFxocjjd3/wv4FJlhOd1ero=; b=GEcjG29fz6m3Kx/IG4eEOee9jaTkwqAw8win5u1xDXgPvf99LOoZsATHRbI4DGvE1z CGdmzFgaHLjvCXYSBI7XyvGltDpuEVJV30B3Nut0hpcKW+gX8LPMlgpXdovCiMCM3mGC lascIImLqSH1jaMkjx6yFl91AFV4uGyrTdVfDRmb+SkJh4TMN/UCPVDXJ860NalbvtAn Yk2lBH9S/56ndP5Wri+FiuSsA4QRvn8971ndBLVM2IMc2hO2v1pFi5PXRayfAXlpXKFx mnZsfjvaHL5Qre4ELZWo+0usaRJ6q0qR3uV/iFEjDixVvY3d3J4glGQHixyr/ou6KTII FzTQ== X-Gm-Message-State: ALoCoQmsLK5f0bh8HqTy3tvddblYs35U6uTtAL8vnD9KxKnOLyefS46PECnKQD64PNvvou7MPo3j X-Received: by 10.180.92.161 with SMTP id cn1mr5903433wib.91.1431177056622; Sat, 09 May 2015 06:10:56 -0700 (PDT) Received: from localhost ([82.166.68.91]) by mx.google.com with ESMTPSA id 14sm13314970wjv.0.2015.05.09.06.10.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 May 2015 06:10:56 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, tgraf@suug.ch, jesse@nicira.com, kaber@trash.net, therbert@google.com, edumazet@google.com, alexander.h.duyck@redhat.com, hannes@stressinduktion.org, ast@plumgrid.com, daniel@iogearbox.net, herbert@gondor.apana.org.au, cwang@twopensource.com, john.fastabend@gmail.com Subject: [patch net-next 04/15] flow_dissector: fix doc for __skb_get_hash and remove couple of empty lines Date: Sat, 9 May 2015 15:10:27 +0200 Message-Id: <1431177038-11555-5-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1431177038-11555-1-git-send-email-jiri@resnulli.us> References: <1431177038-11555-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- net/core/flow_dissector.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index eaa86b5..0d9bc3a 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -337,8 +337,11 @@ void make_flow_keys_digest(struct flow_keys_digest *digest, } EXPORT_SYMBOL(make_flow_keys_digest); -/* - * __skb_get_hash: calculate a flow hash based on src/dst addresses +/** + * __skb_get_hash: calculate a flow hash + * @skb: sk_buff to calculate flow hash from + * + * This function calculates a flow hash based on src/dst addresses * and src/dst port numbers. Sets hash in skb to non-zero hash value * on success, zero indicates no valid hash. Also, sets l4_hash in skb * if hash is a canonical 4-tuple hash over transport ports. @@ -353,12 +356,9 @@ void __skb_get_hash(struct sk_buff *skb) hash = ___skb_get_hash(skb, &keys, hashrnd); if (!hash) return; - if (keys.ports) skb->l4_hash = 1; - skb->sw_hash = 1; - skb->hash = hash; } EXPORT_SYMBOL(__skb_get_hash);