diff options
author | Benjamin Poirier <bpoirier@suse.de> | 2012-04-25 00:49:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-25 14:24:33 -0400 |
commit | da3a9e9e7b8341cfc939818103cb7ef9f5293de2 (patch) | |
tree | dd44a6a0dd670267dbfa077ea54eb20973d15b82 /drivers/net/ethernet/ti | |
parent | 2a5809499e35b53a6044fd34e72b242688b7a862 (diff) |
tlan: add cast needed for proper 64 bit operation
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
-rw-r--r-- | 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 817ad3bc495..efd36691ce5 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) | |||
228 | unsigned long addr; | 228 | unsigned long addr; |
229 | 229 | ||
230 | addr = tag->buffer[9].address; | 230 | addr = tag->buffer[9].address; |
231 | addr |= (tag->buffer[8].address << 16) << 16; | 231 | addr |= ((unsigned long) tag->buffer[8].address << 16) << 16; |
232 | return (struct sk_buff *) addr; | 232 | return (struct sk_buff *) addr; |
233 | } | 233 | } |
234 | 234 | ||