From: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
jukka.rissanen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
Subject: [PATCH net-next 6/6] 6lowpan: udp use subtraction on both conditions
Date: Thu, 14 Nov 2013 16:48:52 +0100 [thread overview]
Message-ID: <1384444132-1427-7-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1384444132-1427-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cleanup code to handle both calculation in the same way.
Signed-off-by: Alexander Aring <alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
net/ieee802154/6lowpan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 6d7f253..d8e1456 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -346,7 +346,7 @@ lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_11;
*(*hc06_ptr + 1) = /* 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));
*hc06_ptr += 2;
} else if ((ntohs(uh->dest) & LOWPAN_NHC_UDP_8BIT_MASK) ==
LOWPAN_NHC_UDP_8BIT_PORT) {
--
1.8.4.2
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
next prev parent reply other threads:[~2013-11-14 15:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-14 15:48 [PATCH net-next 0/6] 6lowpan: udp compression/uncompression fix Alexander Aring
2013-11-14 15:48 ` [PATCH net-next 1/6] 6lowpan: fix udp nullpointer dereferencing Alexander Aring
[not found] ` <1384444132-1427-2-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-14 17:17 ` Werner Almesberger
2013-11-14 15:48 ` [PATCH net-next 2/6] 6lowpan: fix udp compress ordering Alexander Aring
[not found] ` <1384444132-1427-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-14 15:48 ` [PATCH net-next 3/6] 6lowpan: fix udp byte ordering Alexander Aring
2013-11-14 15:48 ` [PATCH net-next 4/6] 6lowpan: add udp warning for elided checksum Alexander Aring
2013-11-14 16:32 ` Joe Perches
2013-11-14 16:50 ` Alexander Aring
2013-11-14 15:48 ` [PATCH net-next 5/6] 6lowpan: udp use lowpan_fetch_skb function Alexander Aring
2013-11-14 15:48 ` Alexander Aring [this message]
2013-11-14 16:19 ` [PATCH net-next 0/6] 6lowpan: udp compression/uncompression fix Eric Dumazet
2013-11-14 16:53 ` Alexander Aring
2013-11-14 22:06 ` David Miller
2013-11-15 5:12 ` Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384444132-1427-7-git-send-email-alex.aring@gmail.com \
--to=alex.aring-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=alex.bluesman.smirnov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=jukka.rissanen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=linux-zigbee-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).