diff options
| author | Benjamin Poirier <bpoirier@suse.de> | 2012-04-25 06:49:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-25 20:24:33 +0200 |
| commit | da3a9e9e7b8341cfc939818103cb7ef9f5293de2 (patch) | |
| tree | dd44a6a0dd670267dbfa077ea54eb20973d15b82 | |
| parent | asix: Fix tx transfer padding for full-speed USB (diff) | |
| download | linux-da3a9e9e7b8341cfc939818103cb7ef9f5293de2.tar.xz linux-da3a9e9e7b8341cfc939818103cb7ef9f5293de2.zip | |
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>
| -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 817ad3bc4957..efd36691ce54 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; } |