From patchwork Mon Nov 17 04:18:36 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 9052 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 A9BD8DDDFF for ; Mon, 17 Nov 2008 15:18:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755985AbYKQESl (ORCPT ); Sun, 16 Nov 2008 23:18:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755943AbYKQESl (ORCPT ); Sun, 16 Nov 2008 23:18:41 -0500 Received: from wf-out-1314.google.com ([209.85.200.169]:61519 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755724AbYKQESk (ORCPT ); Sun, 16 Nov 2008 23:18:40 -0500 Received: by wf-out-1314.google.com with SMTP id 27so2429688wfd.4 for ; Sun, 16 Nov 2008 20:18:40 -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 :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=CPEKyFBWR2w5CaXQrl4x25+7ueXu0jDp7tiRcw9K9NI=; b=vUz6wWT+FwJtdZ9lP83/yK3eeQ3nOSDy2vb1H3f5n8J4NsHqT/TmLcLhisE2DVTYRH /mL2p+ZrTT+JYEcXzUtrjP5Qbd02e8M2MAu5VrP5VxOMdWY3KTkpGMVgMFPzDDw9i5Lw l8bNp1Z9cohQ3ipv4m3v6OdW6zxaMDVDZp3eA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=NrYm7LI9sSpEsnKad+t8U1EpzasYCB/Unr7yAhwtYjg9QDOxxLmKb6y3BJ9rNnCIw1 m2sHX8zn318QCAM8O0i/l5ct83QrQ45Kv6TIGBi2inYDjXv2lm/TagFBsUckfps9j1Mp 6WgI6LeVA3KlJur/GFZn+hhTxFkkrnjYCBzS4= Received: by 10.142.156.2 with SMTP id d2mr1781449wfe.18.1226895519856; Sun, 16 Nov 2008 20:18:39 -0800 (PST) Received: from ?192.168.1.101? (216-19-190-48.dyn.novuscom.net [216.19.190.48]) by mx.google.com with ESMTPS id 30sm4082719wfg.25.2008.11.16.20.18.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 Nov 2008 20:18:39 -0800 (PST) Subject: [PATCH] isdn: remove extra byteswap in isdn_net_ciscohdlck_slarp_send_reply From: Harvey Harrison To: David Miller Cc: linux-netdev , Al Viro , Karsten Keil Date: Sun, 16 Nov 2008 20:18:36 -0800 Message-Id: <1226895516.6150.4.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit a144ea4b7a13087081ab5402fa9ad0bcfd249e67 [IPV4]: annotate struct in_ifaddr Missed this extra byteswap as the isdn inlines hide the htonl inside put_u32 which causes an extra byteswap on little-endian arches. Signed-off-by: Harvey Harrison --- Dave, this is the minimal patch suitable to fix mainline without any net-next material mixed in. I'd suggest sending this one to Linus and then applying my previous patch to net-next (if you need a resend, just ask) Then whenever you do your net-next merge with Linus, the resolution should be trivial. Harvey drivers/isdn/i4l/isdn_net.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index bb904a0..1bfc55d 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -1641,8 +1641,10 @@ isdn_net_ciscohdlck_slarp_send_reply(isdn_net_local *lp) /* slarp reply, send own ip/netmask; if values are nonsense remote * should think we are unable to provide it with an address via SLARP */ p += put_u32(p, CISCO_SLARP_REPLY); - p += put_u32(p, addr); // address - p += put_u32(p, mask); // netmask + *(__be32 *)p = addr; // address + p += 4; + *(__be32 *)p = mask; // netmask + p += 4; p += put_u16(p, 0); // unused isdn_net_write_super(lp, skb);