From patchwork Fri Mar 2 17:22:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Borundia X-Patchwork-Id: 144288 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 68E451007D3 for ; Sat, 3 Mar 2012 04:22:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758601Ab2CBRW3 (ORCPT ); Fri, 2 Mar 2012 12:22:29 -0500 Received: from ch1ehsobe002.messaging.microsoft.com ([216.32.181.182]:41376 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756218Ab2CBRW0 convert rfc822-to-8bit (ORCPT ); Fri, 2 Mar 2012 12:22:26 -0500 Received: from mail188-ch1-R.bigfish.com (10.43.68.236) by CH1EHSOBE013.bigfish.com (10.43.70.63) with Microsoft SMTP Server id 14.1.225.23; Fri, 2 Mar 2012 17:22:26 +0000 Received: from mail188-ch1 (localhost [127.0.0.1]) by mail188-ch1-R.bigfish.com (Postfix) with ESMTP id 38605E035A; Fri, 2 Mar 2012 17:22:26 +0000 (UTC) X-SpamScore: -5 X-BigFish: VPS-5(zz9371I148cMzz1202hzz8275bhz2ei2a8h668h839h944h) X-Forefront-Antispam-Report: CIP:198.70.193.64; KIP:(null); UIP:(null); IPV:NLI; H:avexcashub1.qlogic.com; RD:avexcashub2.qlogic.com; EFVD:NLI Received-SPF: neutral (mail188-ch1: 198.70.193.64 is neither permitted nor denied by domain of qlogic.com) client-ip=198.70.193.64; envelope-from=rajesh.borundia@qlogic.com; helo=avexcashub1.qlogic.com ; 1.qlogic.com ; Received: from mail188-ch1 (localhost.localdomain [127.0.0.1]) by mail188-ch1 (MessageSwitch) id 1330708943544742_21683; Fri, 2 Mar 2012 17:22:23 +0000 (UTC) Received: from CH1EHSMHS027.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.233]) by mail188-ch1.bigfish.com (Postfix) with ESMTP id 80B57300049; Fri, 2 Mar 2012 17:22:23 +0000 (UTC) Received: from avexcashub1.qlogic.com (198.70.193.64) by CH1EHSMHS027.bigfish.com (10.43.70.27) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 2 Mar 2012 17:22:22 +0000 Received: from MNEXCASHUB2.qlogic.org (10.33.2.104) by avexcashub2.qlogic.org (10.1.4.162) with Microsoft SMTP Server (TLS) id 8.3.192.1; Fri, 2 Mar 2012 09:22:19 -0800 Received: from MNEXMB1.qlogic.org ([fe80::8516:7839:9549:6996]) by MNEXCASHUB2.qlogic.org ([::1]) with mapi; Fri, 2 Mar 2012 11:22:17 -0600 From: Rajesh Borundia To: santosh nayak , Sony Chacko CC: netdev , linux-kernel , "kernel-janitors@vger.kernel.org" Date: Fri, 2 Mar 2012 11:22:16 -0600 Subject: RE: [PATCH 3/3] netxen: qlogic ethernet : Fix Endian Bug. Thread-Topic: [PATCH 3/3] netxen: qlogic ethernet : Fix Endian Bug. Thread-Index: Acz4huksGUPQbVX+SkaVPFqBQzZrkwAEDpk/ Message-ID: <13A253B3F9BEFE43B93C09CF75F63CAA81A886ED36@MNEXMB1.qlogic.org> References: <1330701099-18281-1-git-send-email-santoshprasadnayak@gmail.com> In-Reply-To: <1330701099-18281-1-git-send-email-santoshprasadnayak@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-OriginatorOrg: qlogic.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Santosh, Thanks for pointing out the bug. But adapter takes ip in big endian format. So no need to use be32_to_cpu instead data type of ip should be changed to __be32. Also in netxen_config_ipaddr() - req.words[1] = cpu_to_le64(ip); + req.words[1] = ip; Rest looks fine. Rajesh diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 8dc4a134..971b286 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -818,7 +818,7 @@ netxen_check_options(struct netxen_adapter *adapter) adapter->driver_mismatch = 1; return; } - ptr32[i] = cpu_to_le32(val); + ptr32[i] = val; offset += sizeof(u32); } @@ -3028,7 +3028,7 @@ netxen_list_config_vlan_ip(struct netxen_adapter *adapter, list_for_each(head, &adapter->vlan_ip_list) { cur = list_entry(head, struct nx_vlan_ip_list, list); - if (cur->ip_addr == ifa->ifa_address) + if (cur->ip_addr == be32_to_cpu(ifa->ifa_address)) return; } @@ -3039,18 +3039,22 @@ netxen_list_config_vlan_ip(struct netxen_adapter *adapter, return; } - cur->ip_addr = ifa->ifa_address; + cur->ip_addr = be32_to_cpu(ifa->ifa_address); list_add_tail(&cur->list, &adapter->vlan_ip_list); break; case NX_IP_DOWN: list_for_each_entry_safe(cur, tmp_cur, &adapter->vlan_ip_list, list) { - if (cur->ip_addr == ifa->ifa_address) { + if (cur->ip_addr == be32_to_cpu(ifa->ifa_address)) { list_del(&cur->list); kfree(cur); break; } } + break; + default: + printk(KERN_ERR "%ld: Wrong event id \n", event); + break; } } static void @@ -3070,12 +3074,12 @@ netxen_config_indev_addr(struct netxen_adapter *adapter, switch (event) { case NETDEV_UP: netxen_config_ipaddr(adapter, - ifa->ifa_address, NX_IP_UP); + be32_to_cpu(ifa->ifa_address), NX_IP_UP); netxen_list_config_vlan_ip(adapter, ifa, NX_IP_UP); break; case NETDEV_DOWN: netxen_config_ipaddr(adapter, - ifa->ifa_address, NX_IP_DOWN); + be32_to_cpu(ifa->ifa_address), NX_IP_DOWN); netxen_list_config_vlan_ip(adapter, ifa, NX_IP_DOWN); break; default: @@ -3167,11 +3171,11 @@ recheck: switch (event) { case NETDEV_UP: - netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_UP); + netxen_config_ipaddr(adapter, be32_to_cpu(ifa->ifa_address), NX_IP_UP); netxen_list_config_vlan_ip(adapter, ifa, NX_IP_UP); break; case NETDEV_DOWN: - netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_DOWN); + netxen_config_ipaddr(adapter, be32_to_cpu(ifa->ifa_address), NX_IP_DOWN); netxen_list_config_vlan_ip(adapter, ifa, NX_IP_DOWN); break; default: