[TIPC]: Enhancements to msg_set_bits() routine
This patch makes two enhancements to msg_set_bits(): 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: Jon Paul Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
43fb45cb79
commit
1f9eda7e2b
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* net/tipc/msg.h: Include file for TIPC message header routines
|
* net/tipc/msg.h: Include file for TIPC message header routines
|
||||||
*
|
*
|
||||||
* Copyright (c) 2000-2006, Ericsson AB
|
* Copyright (c) 2000-2007, Ericsson AB
|
||||||
* Copyright (c) 2005, Wind River Systems
|
* Copyright (c) 2005-2007, Wind River Systems
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -71,8 +71,11 @@ static inline void msg_set_word(struct tipc_msg *m, u32 w, u32 val)
|
||||||
static inline void msg_set_bits(struct tipc_msg *m, u32 w,
|
static inline void msg_set_bits(struct tipc_msg *m, u32 w,
|
||||||
u32 pos, u32 mask, u32 val)
|
u32 pos, u32 mask, u32 val)
|
||||||
{
|
{
|
||||||
u32 word = msg_word(m,w) & ~(mask << pos);
|
val = (val & mask) << pos;
|
||||||
msg_set_word(m, w, (word |= (val << pos)));
|
val = htonl(val);
|
||||||
|
mask = htonl(mask << pos);
|
||||||
|
m->hdr[w] &= ~mask;
|
||||||
|
m->hdr[w] |= val;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue