From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754481AbZHaGLU (ORCPT ); Mon, 31 Aug 2009 02:11:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754408AbZHaGLT (ORCPT ); Mon, 31 Aug 2009 02:11:19 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:56647 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751472AbZHaGLS (ORCPT ); Mon, 31 Aug 2009 02:11:18 -0400 Message-ID: <4A9B6963.5090207@cn.fujitsu.com> Date: Mon, 31 Aug 2009 14:10:43 +0800 From: Xiao Guangrong User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: David Miller CC: Neil Horman , Wei Yongjun , Netdev , LKML Subject: [PATCH resend] drop_monitor: fix trace_napi_poll_hit() Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The net_dev of backlog napi is NULL, like below: __get_cpu_var(softnet_data).backlog.dev == NULL So, we should check it in napi tracepoint's probe function Acked-by: Neil Horman Signed-off-by: Xiao Guangrong --- net/core/drop_monitor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 9d66fa9..d311202 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -182,7 +182,8 @@ static void trace_napi_poll_hit(struct napi_struct *napi) /* * Ratelimit our check time to dm_hw_check_delta jiffies */ - if (!time_after(jiffies, napi->dev->last_rx + dm_hw_check_delta)) + if (!napi->dev || + !time_after(jiffies, napi->dev->last_rx + dm_hw_check_delta)) return; rcu_read_lock(); -- 1.6.1.2