From patchwork Fri Mar 24 14:14:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 743215 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 3vqQW30hSnz9s88 for ; Sat, 25 Mar 2017 01:18:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XvQ/SL78"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936102AbdCXOO4 (ORCPT ); Fri, 24 Mar 2017 10:14:56 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34288 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965109AbdCXOOu (ORCPT ); Fri, 24 Mar 2017 10:14:50 -0400 Received: by mail-pf0-f193.google.com with SMTP id o126so620704pfb.1; Fri, 24 Mar 2017 07:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mOx9o2hW5y3MGk4FUeq90w//0m8MoXsyCnRySnZfh58=; b=XvQ/SL78PdUJUmyzz1xTkW/TEAOVEbz60XmLm0ae5aPxAi0rJAXjcmjQbtiYNuVVOh 7xtlIDduDmm6P49cpoxQv0WAV0GLkENbZiEv9gAmrZMswm9Xa+6aIcltizgvAmKkYlPG PYibZLpgoBzEqc/k3djPw1xvG9PbDv15Ku9GtnpnGepLqHtNcG3sHW/y1Q4Y76XeyyFI YohmF9oxD7oTE8InDAc0z5QqeLYZxt+K/nqwq8FLRaJUR1L+pg1rKGJUux1/McATLJOM kuq2hHi3BYAwYj4r4TkqtXXVElNJ/8REduP1OgTVllEEJ9N+3loyXzAz8yEvkIq5uCdV bf/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mOx9o2hW5y3MGk4FUeq90w//0m8MoXsyCnRySnZfh58=; b=hwcURUQxLLpLrSKZN18oO5y9Uuc/AQMqFv1PHY8GIJJPthhEeK3WZOWMAQhCmE6aHM 8SIR3Oobo7Uy48VNXyLGrMaMbco3m1ORT+zUlBX8A1YudnWIh0HGyzCiEYRb/TUSyjvv hvF3ssvwdQ6/BA15ge3r8S5zgoPGM+V0TuWE1tjW0FvPvxqEUESusf0dPcrC+fBEuRlO KaQMTeD1JxHIPd2ZIjE6kO7f7P8BuKqCZu6mnaFIB3uquNl59Yiurg3DtZir3lGPutBW jx5I06NdUsXusEYNmfddRG0z2wVtXVz7/k1csNhzAQxPA1yrdStCW+mcUjNCFZaqZagO XFmA== X-Gm-Message-State: AFeK/H13TpuDAuEtL0QB3U8c0HgMWpm83b81gXD/q5MWUR1pZHOjES9OlOBKwZC5UyiihQ== X-Received: by 10.98.205.7 with SMTP id o7mr9669293pfg.171.1490364883961; Fri, 24 Mar 2017 07:14:43 -0700 (PDT) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id p9sm5149499pfe.22.2017.03.24.07.14.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Mar 2017 07:14:43 -0700 (PDT) From: Geliang Tang To: Jamal Hadi Salim , "David S. Miller" Cc: Geliang Tang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net_sched: use setup_deferrable_timer Date: Fri, 24 Mar 2017 22:14:36 +0800 Message-Id: <8333b4c5b4aef4b847b1132d52c214764c41ebe5.1490340639.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use setup_deferrable_timer() instead of init_timer_deferrable() to simplify the code. Signed-off-by: Geliang Tang --- net/sched/cls_flow.c | 5 ++--- net/sched/sch_sfq.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 3d6b928..ca193af 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c @@ -508,9 +508,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, get_random_bytes(&fnew->hashrnd, 4); } - fnew->perturb_timer.function = flow_perturbation; - fnew->perturb_timer.data = (unsigned long)fnew; - init_timer_deferrable(&fnew->perturb_timer); + setup_deferrable_timer(&fnew->perturb_timer, flow_perturbation, + (unsigned long)fnew); tcf_exts_change(tp, &fnew->exts, &e); tcf_em_tree_change(tp, &fnew->ematches, &t); diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 9b0911c..332d94b 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -710,9 +710,8 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt) struct sfq_sched_data *q = qdisc_priv(sch); int i; - q->perturb_timer.function = sfq_perturbation; - q->perturb_timer.data = (unsigned long)sch; - init_timer_deferrable(&q->perturb_timer); + setup_deferrable_timer(&q->perturb_timer, sfq_perturbation, + (unsigned long)sch); for (i = 0; i < SFQ_MAX_DEPTH + 1; i++) { q->dep[i].next = i + SFQ_MAX_FLOWS;