mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
[SCSI] libfc: fix hton24 macro to take expressions as args
hton24(p + 3, value) would fail to compile because p + 3[0] is not a valid expression. Went ahead and converted hton24 and ntoh24 to inline functions, which is better because the parameters are evalutated only once. Signed-off-by: Joe Eykholt <jeykholt@cisco.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
3b719d0161
commit
0b2f74a47f
@ -47,13 +47,18 @@
|
||||
#define ntohll(x) be64_to_cpu(x)
|
||||
#define htonll(x) cpu_to_be64(x)
|
||||
|
||||
#define ntoh24(p) (((p)[0] << 16) | ((p)[1] << 8) | ((p)[2]))
|
||||
|
||||
#define hton24(p, v) do { \
|
||||
p[0] = (((v) >> 16) & 0xFF); \
|
||||
p[1] = (((v) >> 8) & 0xFF); \
|
||||
p[2] = ((v) & 0xFF); \
|
||||
} while (0)
|
||||
static inline u32 ntoh24(const u8 *p)
|
||||
{
|
||||
return (p[0] << 16) | (p[1] << 8) | p[2];
|
||||
}
|
||||
|
||||
static inline void hton24(u8 *p, u32 v)
|
||||
{
|
||||
p[0] = (v >> 16) & 0xff;
|
||||
p[1] = (v >> 8) & 0xff;
|
||||
p[2] = v & 0xff;
|
||||
}
|
||||
|
||||
/**
|
||||
* enum fc_lport_state - Local port states
|
||||
|
Loading…
Reference in New Issue
Block a user