projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1672a36
)
6lowpan: udp use subtraction on both conditions
author
Alexander Aring
<
[email protected]
>
Tue, 17 Dec 2013 13:21:27 +0000
(14:21 +0100)
committer
Marcel Holtmann
<
[email protected]
>
Tue, 17 Dec 2013 14:16:48 +0000
(06:16 -0800)
Cleanup code to handle both calculation in the same way.
Signed-off-by: Alexander Aring <
[email protected]
>
Signed-off-by: Marcel Holtmann <
[email protected]
>
net/ieee802154/6lowpan_iphc.c
patch
|
blob
|
history
diff --git
a/net/ieee802154/6lowpan_iphc.c
b/net/ieee802154/6lowpan_iphc.c
index 8857285b418b3eea65177a9aaeaaa357ea4efdbe..b298bfc1494324ff34edbdd72a31509f7e34b9e1 100644
(file)
--- a/
net/ieee802154/6lowpan_iphc.c
+++ b/
net/ieee802154/6lowpan_iphc.c
@@
-557,7
+557,7
@@
static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
tmp = /* subtraction is faster */
(u8)((ntohs(uh->dest) - LOWPAN_NHC_UDP_4BIT_PORT) +
- ((ntohs(uh->source)
&
LOWPAN_NHC_UDP_4BIT_PORT) << 4));
+ ((ntohs(uh->source)
-
LOWPAN_NHC_UDP_4BIT_PORT) << 4));
lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
} else if ((ntohs(uh->dest) & LOWPAN_NHC_UDP_8BIT_MASK) ==
LOWPAN_NHC_UDP_8BIT_PORT) {