Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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>
  • Loading branch information
mcb30 committed May 2, 2016
1 parent 2d42d3c commit fe62f3c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/drivers/net/tg3/tg3.h
Expand Up @@ -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)
Expand Down

0 comments on commit fe62f3c

Please sign in to comment.