From patchwork Wed Apr 25 14:49:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 154963 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 6154BB6F6E for ; Thu, 26 Apr 2012 00:50:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752513Ab2DYOuT (ORCPT ); Wed, 25 Apr 2012 10:50:19 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:43733 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751413Ab2DYOuR (ORCPT ); Wed, 25 Apr 2012 10:50:17 -0400 Received: by yhmm54 with SMTP id m54so161132yhm.19 for ; Wed, 25 Apr 2012 07:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=2JqaYAb+eP4l/usMGyCp7FACvV9uvMntx5q5rhiwzs4=; b=Rkunm3kYD4lhE9kOqvbQ8t+ixDa0yLoG43919ggZnj2aUDij97YwTmTlLBkDkjAl0y fcASpAq0YKNfYGlFXD07NbxgnT/OjC9clAubMnNGkDD03MSrGP+b1j8EXjLu/lByeVaS gmFpcmlSPwIk3vKke9fgQhDGUsc6P8AH/AGox0d20ye62wWyz+8kSqmX8gvNPooL5c3q wByDk9bc3HZe7TANscEmjCl5ZxPE3+jsw6+NVfHZo6buegbBxZNLK1jdGKZHPiEkeqRC 2guknaevpBn6HwGp3rbQIX8KeV4ZGTnAx+WVo0A6KneW34iucu7q2MdOFWrvqgvNGWIM g73Q== Received: by 10.50.186.161 with SMTP id fl1mr2838553igc.44.1335365416884; Wed, 25 Apr 2012 07:50:16 -0700 (PDT) Received: from localhost.localdomain (modemcable118.38-22-96.mc.videotron.ca. [96.22.38.118]) by mx.google.com with ESMTPS id de2sm20374648igc.4.2012.04.25.07.50.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Apr 2012 07:50:15 -0700 (PDT) From: Benjamin Poirier To: Samuel Chessman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tlan: add cast needed for proper 64 bit operation Date: Wed, 25 Apr 2012 10:49:20 -0400 Message-Id: <1335365360-4891-1-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changes this beauty into a statement that actually has an effect on amd64. Tested-by: Per Jessen Signed-off-by: Benjamin Poirier --- drivers/net/ethernet/ti/tlan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 817ad3b..efd3669 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c @@ -228,7 +228,7 @@ tlan_get_skb(const struct tlan_list *tag) unsigned long addr; addr = tag->buffer[9].address; - addr |= (tag->buffer[8].address << 16) << 16; + addr |= ((unsigned long) tag->buffer[8].address << 16) << 16; return (struct sk_buff *) addr; }