From patchwork Sat Mar 11 00:46:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 737619 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 3vg5880PFNz9s7m for ; Sat, 11 Mar 2017 11:47:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RYmObRYg"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933823AbdCKArg (ORCPT ); Fri, 10 Mar 2017 19:47:36 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34268 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933434AbdCKArd (ORCPT ); Fri, 10 Mar 2017 19:47:33 -0500 Received: by mail-pf0-f193.google.com with SMTP id o126so12411445pfb.1; Fri, 10 Mar 2017 16:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6c5eaCh5S7u4+Zl5GOwI93CLPd5WaIq0RAkGoDYWgaE=; b=RYmObRYgdPeqmMKuGz9hhAKns0FPYVFkj+plr0lIld0tvNEG12eAtGSYvgtAHn6llZ AE+jfsGuTPIVh4nNtPNYjPXt0Jnjea76Ana/5CPXKb1bgd405eJG0yEYoGcQyQQHcMNw x9ZHecvNKpgrdnVnEdLZLFTKyUcn+eaLmifqsRMCMyuQJucbFaf5CAlf8pfwJmHP0TPX sJdF57LDa1PiwQlo/68gkAJNBvMmMWeHRPjBwrG4qKr9r/khWHC2/MF2De5JP/7IaIYV eTzK7hzUzvrukHxZ8fSUY8HUb03glT+nSNXf47YQzxPhXKRkg87TZG8GC5A9/WCbXjMF eyWQ== 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:in-reply-to :references; bh=6c5eaCh5S7u4+Zl5GOwI93CLPd5WaIq0RAkGoDYWgaE=; b=FZofsQOVy3hcddlcIkOgg3TAiwSkNYMU4kt5EhQn+OUJsofGyEysypE5xkN/io7h7H 6A4gR94bV/hUdpsgPZxN7/UzRJO94qLRxFAVNrXkw8YVxF85VsL6II0NrrWgd7xJHUaq SbyyLEOtXuWU+BeCGkAy1GWBEJbGVWovMn2MdafOsefNtUf2X1Nou8hOuN7EdlPZMkMM yWLnSxscGtNRxW+Aixf0Im+lWyV7QSt8e/t1Tp9NXFuylhTpreKf6QtnsU2PpO3GMBla Wn8LuNWsLzk3xXuRz60i3Z5YOy6izfbJY9u8j82h7YM5wAnRiQgbWPyYgXVRbng2J4/2 6AOA== X-Gm-Message-State: AMke39khAGJx7FglV8mmUZIOVysueI8BIyxFpDB5Kalr9/r7/t7HScKVwWHoa46IyK2+8w== X-Received: by 10.84.217.212 with SMTP id d20mr29470587plj.53.1489193251526; Fri, 10 Mar 2017 16:47:31 -0800 (PST) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id u129sm20643568pfb.130.2017.03.10.16.47.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 16:47:31 -0800 (PST) From: Geliang Tang To: Neil Horman , "David S. Miller" Cc: Geliang Tang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drop_monitor: use setup_timer Date: Sat, 11 Mar 2017 08:46:59 +0800 Message-Id: <03f9cf555a71fced65877c85e49fac7e880b338c.1489061285.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <3afa5498142ef68256023257dad37b9f8352e65e.1489060803.git.geliangtang@gmail.com> References: <3afa5498142ef68256023257dad37b9f8352e65e.1489060803.git.geliangtang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- net/core/drop_monitor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index fb55327..70ccda2 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -412,9 +412,8 @@ static int __init init_net_drop_monitor(void) for_each_possible_cpu(cpu) { data = &per_cpu(dm_cpu_data, cpu); INIT_WORK(&data->dm_alert_work, send_dm_alert); - init_timer(&data->send_timer); - data->send_timer.data = (unsigned long)data; - data->send_timer.function = sched_send_work; + setup_timer(&data->send_timer, sched_send_work, + (unsigned long)data); spin_lock_init(&data->lock); reset_per_cpu_data(data); }