From patchwork Thu Oct 25 02:37:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Stanley X-Patchwork-Id: 1641471 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 873913FD4E for ; Thu, 25 Oct 2012 02:38:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933546Ab2JYCii (ORCPT ); Wed, 24 Oct 2012 22:38:38 -0400 Received: from mail-yh0-f46.google.com ([209.85.213.46]:36799 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933068Ab2JYCih (ORCPT ); Wed, 24 Oct 2012 22:38:37 -0400 Received: by mail-yh0-f46.google.com with SMTP id m54so242693yhm.19 for ; Wed, 24 Oct 2012 19:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=/Jv7oiAeDPTCg/H/Sj1ysHCTpnZJaAIRl45Ft4waKhE=; b=WqjjoAiHhxBU2LyOT53iGgDe5o/LYufEK9eP3m2YFb2ZOp7W9uNVXBfaGze32QbZTW KVkVxroZeFQs74Qt/2Fuq/o5wlTamAlUSXt/v6p+w5fNu582+Pbyu+El6dllSKko9lFT UvhOskX9nBhEHaLyxRpguhkiNihSlJ3YnzgRCOl2i+CqPfmKQcrOr1poC1pN8d9nIbeu QzeuFXsCqXRaerbuaOKNVlqknu1TzMUaV9Bplo5q9MgdkSz8PnCE5ENUXgBfI8nneVEi 9dKOG6C2MljC1xsQAbz+nfOnDv7Eoxn2/kq4VOBQ7YqczIe/ODO822yVqJuzZ3yiOd+v mx9A== Received: by 10.236.141.207 with SMTP id g55mr17917874yhj.71.1351132717077; Wed, 24 Oct 2012 19:38:37 -0700 (PDT) Received: from localhost.localdomain (i.am.jds2001.org. [96.126.108.98]) by mx.google.com with ESMTPS id o12sm15009541anp.8.2012.10.24.19.38.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 19:38:35 -0700 (PDT) From: Jon Stanley To: linux-rdma@vger.kernel.org Cc: dledford@redhat.com, Jon Stanley Subject: [PATCH] ibsim/sim_cmd: Fix compile errors Date: Wed, 24 Oct 2012 22:37:57 -0400 Message-Id: <1351132677-11307-1-git-send-email-jonstanley@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org In the previous commit, lines which seemed not destined for upstream prevented sim_cmd from building. Remove them. Signed-off-by: Jon Stanley --- ibsim/sim_cmd.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/ibsim/sim_cmd.c b/ibsim/sim_cmd.c index 7b2cdd0..f44df93 100644 --- a/ibsim/sim_cmd.c +++ b/ibsim/sim_cmd.c @@ -939,7 +939,6 @@ static int do_perf_counter_set(FILE *f, char *line) return -1; } if(*val_error) { - {//REMOVE fprintf(f, "# value %s is not valid integer\n", s); return -1; } @@ -947,7 +946,6 @@ static int do_perf_counter_set(FILE *f, char *line) pc = &(p->portcounters); if(!strcasecmp(attr, "PortCounters")) { - {//REMOVE if(!strcasecmp(field, "SymbolErrorCounter")) pc->errs_sym = check_limit(&value, GS_PERF_ERR_SYM_LIMIT); else if(!strcasecmp(field, "LinkErrorRecoveryCounter")) @@ -984,9 +982,7 @@ static int do_perf_counter_set(FILE *f, char *line) pc->xmt_wait = check_limit(&value, GS_PERF_XMT_WAIT_LIMIT); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortCountersExtended")) { - {//REMOVE if(!strcasecmp(field, "PortXmitData")) pc->ext_xmit_data = check_limit(&value, UINT64_MAX); else if(!strcasecmp(field, "PortRcvData")) @@ -1005,9 +1001,7 @@ static int do_perf_counter_set(FILE *f, char *line) pc->ext_mcast_recv = check_limit(&value, UINT64_MAX); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortRcvErrorDetails")) { - {//REMOVE if(!strcasecmp(field, "PortLocalPhysicalErrors")) pc->rcv_error_details.PortLocalPhysicalErrors = check_limit(&value, GS_PERF_LOCAL_PHYSICAL_ERRORS_LIMIT); @@ -1028,9 +1022,7 @@ static int do_perf_counter_set(FILE *f, char *line) check_limit(&value, GS_PERF_LOOPING_ERRORS_LIMIT); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortXmitDiscardDetails")) { - {//REMOVE if(!strcasecmp(field, "PortInactiveDiscards")) pc->xmit_discard_details.PortInactiveDiscards = check_limit(&value, GS_PERF_INACTIVE_DISCARDS_LIMIT); @@ -1045,9 +1037,7 @@ static int do_perf_counter_set(FILE *f, char *line) check_limit(&value, GS_PERF_SW_HOQ_LIFETIME_LIMIT_DISCARDS_LIMIT); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortOpRcvCounters")) { - {//REMOVE if(!strcasecmp(field, "PortOpRcvPkts")) pc->op_rcv_counters.PortOpRcvPkts = check_limit(&value, GS_PERF_OP_RCV_PKTS_LIMIT); @@ -1056,9 +1046,7 @@ static int do_perf_counter_set(FILE *f, char *line) GS_PERF_OP_RCV_DATA_LIMIT); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortFlowCtlCounters")) { - {//REMOVE if(!strcasecmp(field, "PortXmitFlowPkts")) pc->flow_ctl_counters.PortXmitFlowPkts = check_limit(&value, GS_PERF_XMIT_FLOW_PKTS_LIMIT); @@ -1067,46 +1055,35 @@ static int do_perf_counter_set(FILE *f, char *line) check_limit(&value, GS_PERF_RCV_FLOW_PKTS_LIMIT); else goto field_not_found; - }//REMOVE } else if(!strcasecmp(attr, "PortVLOpPackets")) { - {//REMOVE if(strstr(field, "PortVLOpPackets") != field) goto field_not_found; if(parse_vl_num(attr, field, &vl) < 0) goto field_not_found; pc->vl_op_packets.PortVLOpPackets[vl] = check_limit(&value, GS_PERF_VL_OP_PACKETS_LIMIT); - }//REMOVE } else if(!strcasecmp(attr, "PortVLOpData")) { - {//REMOVE if(strstr(field, "PortVLOpData") != field) goto field_not_found; if(parse_vl_num(attr, field, &vl) < 0) goto field_not_found; pc->vl_op_data.PortVLOpData[vl] = check_limit(&value, GS_PERF_VL_OP_DATA_LIMIT); - }//REMOVE } else if(!strcasecmp(attr, "PortVLXmitFlowCtlUpdateErrors")) { - {//REMOVE if(strstr(field, "PortVLXmitFlowCtlUpdateErrors") != field) goto field_not_found; if(parse_vl_num(attr, field, &vl) < 0) goto field_not_found; pc->vl_xmit_flow_ctl_update_errors.PortVLXmitFlowCtlUpdateErrors[vl] = check_limit(&value, GS_PERF_VL_XMIT_FLOW_CTL_UPDATE_ERRORS); - }//REMOVE } else if(!strcasecmp(attr, "PortVLXmitWaitCounters")) { - {//REMOVE if(strstr(field, "PortVLXmitWaitCounters") != field) goto field_not_found; if(parse_vl_num(attr, field, &vl) < 0) goto field_not_found; pc->vl_xmit_wait_counters.PortVLXmitWait[vl] = check_limit(&value, GS_PERF_VL_XMIT_WAIT_COUNTERS_LIMIT); - }//REMOVE } else { - {//REMOVE - fprintf(f, "# attribute %s cannot be found\n", attr); return -1; } fprintf(f, "%s.%s has been set to %"PRIu64"\n", attr, field, value);