From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751705Ab1ADXvI (ORCPT ); Tue, 4 Jan 2011 18:51:08 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:37879 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672Ab1ADXvE (ORCPT ); Tue, 4 Jan 2011 18:51:04 -0500 X-Greylist: delayed 1576 seconds by postgrey-1.27 at vger.kernel.org; Tue, 04 Jan 2011 18:50:38 EST Message-Id: <20110104232419.267814584@efficios.com> User-Agent: quilt/0.48-1 Date: Tue, 04 Jan 2011 18:16:31 -0500 From: Mathieu Desnoyers To: LKML Cc: Mathieu Desnoyers , Steven Rostedt , Frederic Weisbecker , Ingo Molnar , Neil Horman , Thomas Gleixner Subject: [RFC patch 2/5] trace event skb fix unassigned field References: <20110104231629.996422888@efficios.com> Content-Disposition: inline; filename=trace-event-skb-fix-unassigned-field.patch X-Poly-FromMTA: (test.dorsal.polymtl.ca [132.207.72.60]) at Tue, 4 Jan 2011 23:24:19 +0000 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The field "protocol" in event kfree_skb is left unassigned if skb is NULL, leaving its trace output as garbage. Assign the value to 0 when skb is NULL instead. Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Neil Horman CC: Thomas Gleixner --- include/trace/events/skb.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Index: linux-2.6-lttng/include/trace/events/skb.h =================================================================== --- linux-2.6-lttng.orig/include/trace/events/skb.h +++ linux-2.6-lttng/include/trace/events/skb.h @@ -25,9 +25,7 @@ TRACE_EVENT(kfree_skb, TP_fast_assign( __entry->skbaddr = skb; - if (skb) { - __entry->protocol = ntohs(skb->protocol); - } + __entry->protocol = skb ? ntohs(skb->protocol) : 0; __entry->location = location; ),