From patchwork Fri Apr 24 15:51:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 464254 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 9B999140134 for ; Sat, 25 Apr 2015 02:14:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031269AbbDXPv5 (ORCPT ); Fri, 24 Apr 2015 11:51:57 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:37549 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031114AbbDXPvx (ORCPT ); Fri, 24 Apr 2015 11:51:53 -0400 Received: by widdi4 with SMTP id di4so25125593wid.0 for ; Fri, 24 Apr 2015 08:51:52 -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=y1YOkg5GxCeOgviuWEf4p3m2QR0/Wo3LK8F1R/BO574=; b=Nw1eZTxl6ini4JHoAetklWvV4PUuC1gO2GloMNSZzrrye61U0cp0tC8EVyKSCccBcW aoQwkxBLApVPHr9uh3pvVhuKIw/yKJI6uj/FikgD6sInfRu10YuRLgaJ05UqA966ZUQp HbpxMKlbIrG+gU6+ZT9x5iX9QkG4NhqpdNTsaFm7agFJRUZSfFa12ZU1vfjjN9e61xoE UR3pZ55hYbSpLwZaVWB8kvurYjbVnX14oqPFNTv4VT2Cm/8I6gmboPpL2L+PPauThQdC plZMlhJmDdPMXw2j0a/8NXk4BApDFG4ScwY3oMBiQYZNA5bTQwCJew7oKUmQ9TC/Zq77 PwfQ== X-Gm-Message-State: ALoCoQkyxkuXc4zaNDpbBmY5bFuT2BqDfW2rRuCj5Rcl7H0lMeGoVkbXdVOkNBnH2psYlKCgC0VD X-Received: by 10.194.2.47 with SMTP id 15mr4366323wjr.101.1429890712541; Fri, 24 Apr 2015 08:51:52 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by mx.google.com with ESMTPSA id n8sm4001909wiy.19.2015.04.24.08.51.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 08:51:51 -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 v4 RFC 05/15] net: move __skb_get_hash function declaration to flow_dissector.h Date: Fri, 24 Apr 2015 17:51:31 +0200 Message-Id: <1429890701-30052-6-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1429890701-30052-1-git-send-email-jiri@resnulli.us> References: <1429890701-30052-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since the definition of the function is in flow_dissector.c, it makes sense to have the declaration in flow_dissector.h Signed-off-by: Jiri Pirko --- include/linux/skbuff.h | 1 - include/net/flow_dissector.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 16fa278..57f5e5c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -917,7 +917,6 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type) skb->hash = hash; } -void __skb_get_hash(struct sk_buff *skb); static inline __u32 skb_get_hash(struct sk_buff *skb) { if (!skb->l4_hash && !skb->sw_hash) diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h index b27cd24..8a5bf48 100644 --- a/include/net/flow_dissector.h +++ b/include/net/flow_dissector.h @@ -46,6 +46,7 @@ static inline __be32 skb_flow_get_ports(const struct sk_buff *skb, } u32 flow_hash_from_keys(struct flow_keys *keys); +void __skb_get_hash(struct sk_buff *skb); u32 skb_get_poff(const struct sk_buff *skb); u32 __skb_get_poff(const struct sk_buff *skb, void *data, const struct flow_keys *keys, int hlen);