projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
tipc
/
msg.h
diff --git
a/net/tipc/msg.h
b/net/tipc/msg.h
index 88a2ee03bb2a33bac948f132faaeb8e3ef36454b..ad487e8abcc2f2f0bcada4432db6c25e8dbf0dee 100644
(file)
--- a/
net/tipc/msg.h
+++ b/
net/tipc/msg.h
@@
-70,7
+70,8
@@
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);
+ mask = mask << pos;
+ m->hdr[w] &= ~htonl(mask);
m->hdr[w] |= htonl(val);
}