diff options
| author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2009-08-30 20:10:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 18:18:12 -0700 |
| commit | f2798eb4e01b095f273f4bf40f511c9d69c0e1da (patch) | |
| tree | 480235ce9efabae5c0142617affa7a4b510ccf3a | |
| parent | 3732e9bd2d841db588624b1bf560bfc9d0dcb1fd (diff) | |
| download | blackbird-op-linux-f2798eb4e01b095f273f4bf40f511c9d69c0e1da.tar.gz blackbird-op-linux-f2798eb4e01b095f273f4bf40f511c9d69c0e1da.zip | |
drop_monitor: fix trace_napi_poll_hit()
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 <nhorman@tuxdriver.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | 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 9d66fa953ab7..d31120248c03 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(); |
