From patchwork Sat Jan 10 06:24:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 17720 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 73E68474CA for ; Sat, 10 Jan 2009 17:24:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbZAJGYj (ORCPT ); Sat, 10 Jan 2009 01:24:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751932AbZAJGYj (ORCPT ); Sat, 10 Jan 2009 01:24:39 -0500 Received: from wf-out-1314.google.com ([209.85.200.170]:40249 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbZAJGYi (ORCPT ); Sat, 10 Jan 2009 01:24:38 -0500 Received: by wf-out-1314.google.com with SMTP id 27so10235504wfd.4 for ; Fri, 09 Jan 2009 22:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=NGbFIRVRzp3MPqc86yViHUzn7UThM5E/JlRfN0NUmR0=; b=gXeU1aXlwy3cFuERFl7K38UW8rNmPuMsqOq2qZJxNGBYrzbXuwjqWyAmOn9PSg8cFn 4Q2KlXCx/BWBYp1Ha3r8Pt2qIAFkL41qU49f7RF4QOWw/7EVgO3BWTHQeK0w62o4wSKF lEp0KISJyZ3mwLFpe2U6fLU9zqGaiGbTQo4oY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=uHjvodgBDHlwUaM9QJMNZd0ZmAWC7vm7e35az1h0lciw3KnU1ApOE8XOZGauOnA2B2 fP4niLKhdOoTpD2L5aTXyODNUgGVLFoK/XK/C40TnCv+ICSYrMUJOax+OH3vRDQOBtNz pxG9pgTwrnPTkoZQkQGn0KeHvCDDTeF8OMZTU= Received: by 10.142.134.17 with SMTP id h17mr11082724wfd.228.1231568678060; Fri, 09 Jan 2009 22:24:38 -0800 (PST) Received: from ?192.168.1.100? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 24sm44349921wfc.2.2009.01.09.22.24.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Jan 2009 22:24:37 -0800 (PST) Subject: [PATCH] nes: fix reversed IP address From: Harvey Harrison To: Roland Dreier Cc: netdev@vger.kernel.org, David Miller In-Reply-To: References: Date: Fri, 09 Jan 2009 22:24:35 -0800 Message-Id: <1231568675.5714.25.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 63779436ab4ad0867bcea53bf853b0004d7b895di (drivers: replace NIPQUAD()) accidentally replaced two HIPQUAD()s causing IP addresses to be printed in reverse order, add two temporary local vars. Signed-off-by: Harvey Harrison --- I'll start working on a patch working directly with _be32s, but this is the safest for now. drivers/infiniband/hw/nes/nes_cm.c | 3 ++- drivers/infiniband/hw/nes/nes_utils.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 6ba57e9..2395b20 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -778,12 +778,13 @@ static struct nes_cm_node *find_node(struct nes_cm_core *cm_core, unsigned long flags; struct list_head *hte; struct nes_cm_node *cm_node; + __be32 tmp_addr = cpu_to_be32(loc_addr); /* get a handle on the hte */ hte = &cm_core->connected_nodes; nes_debug(NES_DBG_CM, "Searching for an owner node: %pI4:%x from core %p->%p\n", - &loc_addr, loc_port, cm_core, hte); + &tmp_addr, loc_port, cm_core, hte); /* walk list and find cm_node associated with this session ID */ spin_lock_irqsave(&cm_core->ht_lock, flags); diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index aa9b734..feb7401 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c @@ -655,6 +655,7 @@ int nes_arp_table(struct nes_device *nesdev, u32 ip_addr, u8 *mac_addr, u32 acti struct nes_adapter *nesadapter = nesdev->nesadapter; int arp_index; int err = 0; + __be32 tmp_addr = cpu_to_be32(ip_addr); for (arp_index = 0; (u32) arp_index < nesadapter->arp_table_size; arp_index++) { if (nesadapter->arp_table[arp_index].ip_addr == ip_addr) @@ -683,7 +684,7 @@ int nes_arp_table(struct nes_device *nesdev, u32 ip_addr, u8 *mac_addr, u32 acti /* DELETE or RESOLVE */ if (arp_index == nesadapter->arp_table_size) { nes_debug(NES_DBG_NETDEV, "MAC for %pI4 not in ARP table - cannot %s\n", - &ip_addr, action == NES_ARP_RESOLVE ? "resolve" : "delete"); + &tmp_addr, action == NES_ARP_RESOLVE ? "resolve" : "delete"); return -1; }