aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2013-12-17 08:21:27 -0500
committerMarcel Holtmann <marcel@holtmann.org>2013-12-17 09:16:48 -0500
commit45939d2570e4c9120a732464b2dca9c0e5606eb2 (patch)
treeb865f18887af15caf1e38f87483b5762d640d716 /net/ieee802154
parent1672a36b73eb279910691359962aa999a7443aaf (diff)
6lowpan: udp use subtraction on both conditions
Cleanup code to handle both calculation in the same way. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/6lowpan_iphc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 8857285b418b..b298bfc14943 100644
--- 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)
557 lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp)); 557 lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
558 tmp = /* subtraction is faster */ 558 tmp = /* subtraction is faster */
559 (u8)((ntohs(uh->dest) - LOWPAN_NHC_UDP_4BIT_PORT) + 559 (u8)((ntohs(uh->dest) - LOWPAN_NHC_UDP_4BIT_PORT) +
560 ((ntohs(uh->source) & LOWPAN_NHC_UDP_4BIT_PORT) << 4)); 560 ((ntohs(uh->source) - LOWPAN_NHC_UDP_4BIT_PORT) << 4));
561 lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp)); 561 lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
562 } else if ((ntohs(uh->dest) & LOWPAN_NHC_UDP_8BIT_MASK) == 562 } else if ((ntohs(uh->dest) & LOWPAN_NHC_UDP_8BIT_MASK) ==
563 LOWPAN_NHC_UDP_8BIT_PORT) { 563 LOWPAN_NHC_UDP_8BIT_PORT) {