From patchwork Tue Feb 12 10:12:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219766 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 2CB122C0320 for ; Tue, 12 Feb 2013 21:12:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932901Ab3BLKMm (ORCPT ); Tue, 12 Feb 2013 05:12:42 -0500 Received: from mail-ee0-f52.google.com ([74.125.83.52]:57158 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932873Ab3BLKMj (ORCPT ); Tue, 12 Feb 2013 05:12:39 -0500 Received: by mail-ee0-f52.google.com with SMTP id b15so3444799eek.25 for ; Tue, 12 Feb 2013 02:12:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=IxI56t58R+gg0uht2wXp4AwXt+dDGgMWThqwWcneVVo=; b=HFUmeRqRG2KRdUxi8FdPmlqlBleqavia4a2IjiyseJIIc0V4YwjaDslTKxGIX6xPrv 9wdOlNJe3eHcI+Vz6ykiLdBxiEhREiJzY1xKdXXZRZwxmC4Ti52KaFiDESzADA42Mcw9 vncydIdlGxJ+elzvmKBPGM0gSwc2lktvZ2SdHBEgIUlE6GwyrS33LomUGn/gRK0LNtr+ 7VWL8L7ppSsXvTD+zf6THXoPC4UzFg00/y7TIuqyQttYynUremrGMLpL7TUE4GlKL87r FDQVn78V0CF6S9xqEKaGsrcoOzwxx+nZV22J4jHi91AKJiZKH9oTOaofdXdwQ0901sOT 8kXA== X-Received: by 10.14.179.5 with SMTP id g5mr61011677eem.41.1360663958339; Tue, 12 Feb 2013 02:12:38 -0800 (PST) Received: from localhost (ip-94-112-98-141.net.upcbroadband.cz. [94.112.98.141]) by mx.google.com with ESMTPS id q42sm57725893eem.14.2013.02.12.02.12.36 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 02:12:37 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, jhs@mojatatu.com, kuznet@ms2.inr.ac.ru, j.vimal@gmail.com Subject: [patch net-next v5 08/11] act_police: move struct tcf_police to act_police.c Date: Tue, 12 Feb 2013 11:12:06 +0100 Message-Id: <1360663929-1023-9-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360663929-1023-1-git-send-email-jiri@resnulli.us> References: <1360663929-1023-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmSCU25jO4TtqVedFlqfDfeAdaze4ctHq97r0Ccc5N0KaUfTsJqvMkyTBqsT1ifYpwyd6kM Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's not used anywhere else, so move it. Signed-off-by: Jiri Pirko Acked-by: Jamal Hadi Salim Acked-by: Eric Dumazet --- include/net/act_api.h | 15 --------------- net/sched/act_police.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/net/act_api.h b/include/net/act_api.h index 112c25c..06ef7e9 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -35,21 +35,6 @@ struct tcf_common { #define tcf_lock common.tcfc_lock #define tcf_rcu common.tcfc_rcu -struct tcf_police { - struct tcf_common common; - int tcfp_result; - u32 tcfp_ewma_rate; - u32 tcfp_burst; - u32 tcfp_mtu; - u32 tcfp_toks; - u32 tcfp_ptoks; - psched_time_t tcfp_t_c; - struct qdisc_rate_table *tcfp_R_tab; - struct qdisc_rate_table *tcfp_P_tab; -}; -#define to_police(pc) \ - container_of(pc, struct tcf_police, common) - struct tcf_hashinfo { struct tcf_common **htab; unsigned int hmask; diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 8dbd695..378a649 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -22,6 +22,21 @@ #include #include +struct tcf_police { + struct tcf_common common; + int tcfp_result; + u32 tcfp_ewma_rate; + u32 tcfp_burst; + u32 tcfp_mtu; + u32 tcfp_toks; + u32 tcfp_ptoks; + psched_time_t tcfp_t_c; + struct qdisc_rate_table *tcfp_R_tab; + struct qdisc_rate_table *tcfp_P_tab; +}; +#define to_police(pc) \ + container_of(pc, struct tcf_police, common) + #define L2T(p, L) qdisc_l2t((p)->tcfp_R_tab, L) #define L2T_P(p, L) qdisc_l2t((p)->tcfp_P_tab, L)