forked from luck/tmp_suning_uos_patched
[TIPC]: Enhancements to message header writing
This patch makes two enhancements to the routine used to set bit fields within a TIPC message header: 1) It now ignores any bits of the new field value that are not covered by the mask being used. (Previously, if the new value exceeded the size of the mask the extra bits could corrupt other fields in the message header word being updated.) 2) The code has been optimized to minimize the number of run-time endianness conversion operations by leveraging the fact that the mask (and, in some cases, the value as well) is constant and the necessary conversion can be performed by the compiler. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
37695420a2
commit
c0cb7ef086
|
@ -70,8 +70,10 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
|
|||
u32 pos, u32 mask, u32 val)
|
||||
{
|
||||
val = (val & mask) << pos;
|
||||
m->hdr[w] &= ~htonl(mask << pos);
|
||||
m->hdr[w] |= htonl(val);
|
||||
val = htonl(val);
|
||||
mask = htonl(mask << pos);
|
||||
m->hdr[w] &= ~mask;
|
||||
m->hdr[w] |= val;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue
Block a user