From f0596177f9fc37255b9adfe5dc10d77cc6d83ae8 Mon Sep 17 00:00:00 2001 From: Benjamin Poirier Date: Wed, 25 Apr 2012 04:49:20 +0000 Subject: [PATCH] --- yaml --- r: 299924 b: refs/heads/master c: da3a9e9e7b8341cfc939818103cb7ef9f5293de2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/tlan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7fe3e983a922..29b578b955af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a5809499e35b53a6044fd34e72b242688b7a862 +refs/heads/master: da3a9e9e7b8341cfc939818103cb7ef9f5293de2 diff --git a/trunk/drivers/net/ethernet/ti/tlan.c b/trunk/drivers/net/ethernet/ti/tlan.c index 817ad3bc4957..efd36691ce54 100644 --- a/trunk/drivers/net/ethernet/ti/tlan.c +++ b/trunk/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; }