Patchwork tlan: add cast needed for proper 64 bit operation

login
register
mail settings
Submitter Benjamin Poirier
Date April 25, 2012, 2:49 p.m.
Message ID <1335365360-4891-1-git-send-email-bpoirier@suse.de>
Download mbox | patch
Permalink /patch/154963/
State Accepted
Delegated to: David Miller
Headers show

Comments

Benjamin Poirier - April 25, 2012, 2:49 p.m.
Changes this beauty into a statement that actually has an effect on amd64.

Tested-by: Per Jessen <per@opensuse.org>
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
---
 drivers/net/ethernet/ti/tlan.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - April 25, 2012, 6:24 p.m.
From: Benjamin Poirier <bpoirier@suse.de>
Date: Wed, 25 Apr 2012 10:49:20 -0400

> Changes this beauty into a statement that actually has an effect on amd64.
> 
> Tested-by: Per Jessen <per@opensuse.org>
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;
 }