david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[tg3] Fix _tg3_flag() for 64-bit builds 

Commit 86f96a4 ("[tg3] Remove x86-specific inline assembly")
introduced a regression in _tg3_flag() in 64-bit builds, since any
flags in the upper 32 bits of a 64-bit unsigned long would be
discarded when truncating to a 32-bit int.

Debugged-by: Shane Thompson <shane.thompson@aeontech.com.au>
Tested-by: Shane Thompson <shane.thompson@aeontech.com.au>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-05-02 13:20:26 +01:00
parent 2d42d3cff6
commit fe62f3c831
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/net/tg3/tg3.h
View File

@ -3324,7 +3324,7 @@ static inline int _tg3_flag(enum TG3_FLAGS flag, unsigned long *bits)
{
unsigned int index = ( flag / ( 8 * sizeof ( *bits ) ) );
unsigned int bit = ( flag % ( 8 * sizeof ( *bits ) ) );
return ( bits[index] & ( 1UL << bit ) );
return ( !! ( bits[index] & ( 1UL << bit ) ) );
}
static inline void _tg3_flag_set(enum TG3_FLAGS flag, unsigned long *bits)