From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964922Ab3GCSz3 (ORCPT ); Wed, 3 Jul 2013 14:55:29 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:5725 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933201Ab3GCSky (ORCPT ); Wed, 3 Jul 2013 14:40:54 -0400 X-Authority-Analysis: v=2.0 cv=Tr1kdUrh c=1 sm=0 a=Sro2XwOs0tJUSHxCKfOySw==:17 a=Drc5e87SC40A:10 a=Ciwy3NGCPMMA:10 a=058KDAVTZIMA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=KGjhK52YXX0A:10 a=KmIfebjHR8sA:10 a=8T59DR07AAAA:8 a=VwQbUJbxAAAA:8 a=J1Y8HTJGAAAA:8 a=wl_4uSNixEY9zfZ_NzMA:9 a=4N9Db7Z2_RYA:10 a=jeBq3FmKZ4MA:10 a=OVOsPnJimuHNiOwI:21 a=kLkQF2R4YAT-Hi8p:21 a=Sro2XwOs0tJUSHxCKfOySw==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 67.255.60.225 Message-Id: <20130703184047.942139436@goodmis.org> User-Agent: quilt/0.60-1 Date: Wed, 03 Jul 2013 14:39:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Hutchings , "David S. Miller" Subject: [020/141] perf: net_dropmonitor: Fix trace parameter order References: <20130703183857.307196999@goodmis.org> Content-Disposition: inline; filename=0020-perf-net_dropmonitor-Fix-trace-parameter-order.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.6.11.6 stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings [ Upstream commit 140c3c6a2bcd2c31e2f7f5a8d59689724776c8e5 ] This works much better if we don't treat protocol numbers as addresses. Cc: stable@vger.kernel.org Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller Signed-off-by: Steven Rostedt --- tools/perf/scripts/python/net_dropmonitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py index a4ffc95..adbfbf0 100755 --- a/tools/perf/scripts/python/net_dropmonitor.py +++ b/tools/perf/scripts/python/net_dropmonitor.py @@ -64,7 +64,7 @@ def trace_end(): # called from perf, when it finds a correspoinding event def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, - skbaddr, protocol, location): + skbaddr, location, protocol): slocation = str(location) try: drop_log[slocation] = drop_log[slocation] + 1 -- 1.7.10.4