From patchwork Sat May 9 13:10:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 470314 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 ADAD7140218 for ; Sat, 9 May 2015 23:11:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751479AbbEINLF (ORCPT ); Sat, 9 May 2015 09:11:05 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:35815 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbbEINLC (ORCPT ); Sat, 9 May 2015 09:11:02 -0400 Received: by wgyo15 with SMTP id o15so93555804wgy.2 for ; Sat, 09 May 2015 06:11:01 -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=2Bbr7xvjHVwdo3BzFbjBwTuPa4BE6rwFuAQfcHDxm98=; b=fyJM8Q2MnD3GHH01nU5W5GcKTinX+uVL/HqWtkjDJd+6zf8MCditms0GjscElGi+Ja +5BqBG0dUIWVhzpsaFgJD2zRXZs06rJgV+5TbPo9qkNdjeFXtDQt6TwKqgjx8Q8dtYVW IfbzGK9Y9YSSJEJUwtAgGVRjONUiswHZNfdyVCfeyE0ehnemrv40beaWY/P8EtYJBvqP XLvB/Jf22jElCyjh4dxF/THuVV+kxvbkSePgd0ekRYhNxJP/FwaMOoi2FNJ3rStGpOZl k6uCygn9N8STJNglzNoQJFQyVHqSvWDsC2fwgbtyEaDOVjIl+UUZxGt/EcK3qBgV/HRE WAMA== X-Gm-Message-State: ALoCoQnS4Alhmx9wSr/MTnUg38HE/+5nJbOOCnhL5r3NUX9KNvnY8wzwykRZ1HxVexOGKohA95oz X-Received: by 10.194.23.197 with SMTP id o5mr5010934wjf.75.1431177060948; Sat, 09 May 2015 06:11:00 -0700 (PDT) Received: from localhost ([82.166.68.91]) by mx.google.com with ESMTPSA id l3sm3762124wik.16.2015.05.09.06.10.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 May 2015 06:11:00 -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 05/15] net: move __skb_get_hash function declaration to flow_dissector.h Date: Sat, 9 May 2015 15:10:28 +0200 Message-Id: <1431177038-11555-6-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 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 8616bfe..55677e9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -918,7 +918,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 4570cca..e4ee761 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);