From patchwork Wed Jul 20 06:04:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 650568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rvRFV3Bn6z9snm for ; Wed, 20 Jul 2016 16:04:30 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 4AB9F10B9A; Tue, 19 Jul 2016 23:04:29 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 41DE210B96 for ; Tue, 19 Jul 2016 23:04:28 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 9BE771E00E7 for ; Wed, 20 Jul 2016 00:04:27 -0600 (MDT) X-ASG-Debug-ID: 1468994667-09eadd7a29454f0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id HusPcGrFpvsec2z7 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 20 Jul 2016 00:04:27 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO relay3-d.mail.gandi.net) (217.70.183.195) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 20 Jul 2016 06:04:27 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.195 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.195 X-Barracuda-RBL-IP: 217.70.183.195 Received: from mfilter20-d.gandi.net (mfilter20-d.gandi.net [217.70.178.148]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id B41DDA80BE for ; Wed, 20 Jul 2016 08:04:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter20-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter20-d.gandi.net (mfilter20-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id UTQHGdV70FHy for ; Wed, 20 Jul 2016 08:04:24 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from phiomia.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: jpettit@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id AD4E2A80C2 for ; Wed, 20 Jul 2016 08:04:23 +0200 (CEST) X-CudaMail-Envelope-Sender: jpettit@ovn.org From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-719000084 X-CudaMail-DTE: 072016 X-CudaMail-Originating-IP: 217.70.183.195 Date: Tue, 19 Jul 2016 23:04:20 -0700 X-ASG-Orig-Subj: [##CM-E2-719000084##][PATCH] packets: Fix in6_is_lla() on systems without s6_addr32 defined. Message-Id: <1468994660-4501-1-git-send-email-jpettit@ovn.org> X-Mailer: git-send-email 1.9.1 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1468994667 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH] packets: Fix in6_is_lla() on systems without s6_addr32 defined. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Reported-by: Ben Pfaff Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- lib/packets.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/packets.h b/lib/packets.h index 8f11e2c..5fd1e51 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -987,8 +987,9 @@ in6_is_lla(struct in6_addr *addr) #ifdef s6_addr32 return addr->s6_addr32[0] == htonl(0xfe800000) && !(addr->s6_addr32[1]); #else - return addr->s6_addr[0] == htons(0xfe80) && - !(addr->s6_addr[1] | addr->s6_addr[2] | addr->s6_addr[3]); + return addr->s6_addr[0] == 0xfe && addr->s6_addr[1] == 0x80 && + !(addr->s6_addr[2] | addr->s6_addr[3] | addr->s6_addr[4] | + addr->s6_addr[5] | addr->s6_addr[6] | addr->s6_addr[7]); #endif }